diff --git a/fuel/app/views/episode/index.php b/fuel/app/views/episode/index.php
index e78419f..66728e0 100644
--- a/fuel/app/views/episode/index.php
+++ b/fuel/app/views/episode/index.php
@@ -15,11 +15,11 @@
     <div class="PageHeaderRight-pageHeaderRight-2CT0g">
         <div class="pageHeaderToolbar-toolbarContainer-2N-IJ Measure-container-2XznZ">
             <div class="pageHeaderToolbar-toolbar-1lW-M">
-                <button id="id-16" data-original-title="Lire" data-toggle="tooltip" data-placement="bottom" role="button"
+                <button id="id-16" data-original-title="Play" data-toggle="tooltip" data-placement="bottom" role="button"
                         class="ToolbarButton-toolbarButton-3xzHJ Link-link-2XYrU Link-default-32xSO"
                         type="button"><i class="plex-icon-toolbar-play-560" aria-hidden="true"></i>
                 </button>
-                <button id="id-15" data-original-title="Plus..." aria-haspopup="true" data-placement="bottom" data-toggle="tooltip"
+                <button id="id-15" data-original-title="More..." aria-haspopup="true" data-placement="bottom" data-toggle="tooltip"
                         role="button"
                         class="ToolbarButton-toolbarButton-3xzHJ Link-link-2XYrU Link-default-32xSO"
                         type="button"><i class="plex-icon-toolbar-more-560" aria-hidden="true"></i>
@@ -33,7 +33,7 @@
             </div>
         </div>
         <div class="PrePlayPageHeader-divider-WQRk8 PageHeaderDivider-pageHeaderDivider-DvwUq"></div>
-        <button id="id-235" data-original-title="Montrer les affiches" data-placement="bottom" data-toggle="tooltip" role="button"
+        <button id="id-235" data-original-title="Show poster" data-placement="bottom" data-toggle="tooltip" role="button"
                 class="ToolbarButton-toolbarButton-3xzHJ Link-link-2XYrU Link-default-32xSO      " type="button">
             <i class="plex-icon-toolbar-artwork-560" aria-hidden="true"></i></button>
         <div class="PrePlayPageHeader-divider-WQRk8 PageHeaderDivider-pageHeaderDivider-DvwUq"></div>
@@ -77,6 +77,23 @@
                             </div>
                         </div>
                     </div>
+                    <?php if((int)$episode->getMetaData()['Media']['@attributes']['videoResolution'] >= 720) : ?>
+                        <div class="col-sm-4 text-center" style="font-size: 35px;"><i class="glyphicon video-hd"></i></div>
+                    <?php else: ?>
+                        <div class="col-sm-4 text-center" style="font-size: 35px;"><i class="glyphicon video-sd"></i></div>
+                    <?php endif; ?>
+
+                    <?php if($episode->getMetaData()['Stream']['Audio'][0]['codec'] === 'ac3') : ?>
+                        <div class="col-sm-4 text-center" title="Dolby Digital" data-placement="bottom" data-toggle="tooltip" style="font-size: 35px;"><i class="glyphicon sound-dolby"></i></div>
+                    <?php endif; ?>
+
+                    <?php if(preg_match('/7\.1(\([a-z]*\))?/',$episode->getMetaData()['Stream']['Audio'][0]['audioChannelLayout'])) : ?>
+                        <div class="col-sm-4 text-center" style="font-size: 35px;"><i class="glyphicon sound-7-1"></i></div>
+                    <?php elseif (preg_match('/5\.1(\([a-z]*\))?/',$episode->getMetaData()['Stream']['Audio'][0]['audioChannelLayout'])) : ?>
+                        <div class="col-sm-4 text-center" style="font-size: 35px;"><i class="glyphicon sound-5-1"></i></div>
+                    <?php elseif (preg_match('/stereo/',$episode->getMetaData()['Stream']['Audio'][0]['audioChannelLayout'])) : ?>
+                        <div class="col-sm-4 text-center" title="Stereo" data-placement="bottom" data-toggle="tooltip" style="font-size: 35px;"><i class="glyphicon sound-stereo"></i></div>
+                    <?php endif; ?>
                 </div>
                 <div class="PrePlayMetadataContent-content-2ww3j" style="padding-left: 320px;">
                     <div>
@@ -108,13 +125,16 @@
                                             class=" Link-link-2XYrU Link-default-32xSO"><?php echo $episode->title; ?></a></span>
                                 </div>
                                 <div class="PrePlayRatingRightTitle-ratingRightTitle-1d4Yy PrePlayRightTitle-rightTitle-VxiwU">
-                                    <span class="PrePlayRatingRightTitle-starRating-31XbA"></span><span
-                                        class="PrePlayRatingRightTitle-criticRating-2J_tn"><div
-                                            class="CriticRating-container-2t5Lw"><div
-                                                class="CriticRating-rating-1Ntfn"><div
-                                                    class="CriticRating-other-uJc1K CriticRating-ratingImage-1bHp5"
-                                                    title="Note"></div><?php echo $episode->rating * 10; ?>%
-                                                </div></div></span></div>
+                                    <span class="PrePlayRatingRightTitle-starRating-31XbA"></span>
+                                    <span class="PrePlayRatingRightTitle-criticRating-2J_tn">
+                                        <div class="CriticRating-container-2t5Lw">
+                                            <div class="CriticRating-rating-1Ntfn">
+                                                <div class="CriticRating-other-uJc1K CriticRating-ratingImage-1bHp5" title="Note"></div>
+                                                <?php echo $episode->rating; ?>
+                                            </div>
+                                        </div>
+                                    </span>
+                                </div>
                             </div>
                             <div class="PrePlayTertiaryTitle-tertiaryTitle-1Rc92">
                                 <div class="PrePlayLeftTitle-leftTitle-Ev1KG"><span
@@ -189,15 +209,26 @@
                                 <div class="PrePlayDetailsGroupItem-groupItem-3Tut9">
                                     <div class="PrePlayDetailsGroupItem-label-2Ee43">Audio</div>
                                     <div class="PrePlayDetailsGroupItem-content-1aRNU">
-                                        <span data-qa-id="audioStream">
-                                            Inconnu
+                                        <span>
+                                            <?php echo isset($episode->getMetaData()['Stream']['Audio'][0]['language']) ? $episode->getMetaData()['Stream']['Audio'][0]['language'] : ''; ?>
                                             <span class="DashSeparator-separator-2a3yn">—</span>
-                                            MP3 Stéréo
-                                        </span></div>
+                                            <?php echo isset($episode->getMetaData()['Stream']['Audio'][0]['displayTitle']) ? $episode->getMetaData()['Stream']['Audio'][0]['displayTitle'] : (isset($episode->getMetaData()['Stream']['Audio'][0]['title']) ? $episode->getMetaData()['Stream']['Audio'][0]['title'] : $episode->getMetaData()['Stream']['Audio'][0]['language']); ?>
+                                        </span>
+                                    </div>
                                 </div>
                                 <div class="PrePlayDetailsGroupItem-groupItem-3Tut9">
                                     <div class="PrePlayDetailsGroupItem-label-2Ee43">Sous-titres</div>
-                                    <div class="PrePlayDetailsGroupItem-content-1aRNU"><span>Aucun</span></div>
+                                    <div class="PrePlayDetailsGroupItem-content-1aRNU">
+                                        <span>
+                                            <?php if(count($episode->getMetaData()['Stream']['SubTitle']) > 0): ?>
+                                                <?php echo isset($episode->getMetaData()['Stream']['SubTitle'][0]['language']) ? $episode->getMetaData()['Stream']['SubTitle'][0]['language'] : ''; ?>
+                                                <span class="DashSeparator-separator-2a3yn">—</span>
+                                                <?php echo isset($episode->getMetaData()['Stream']['SubTitle'][0]['displayTitle']) ? $episode->getMetaData()['Stream']['SubTitle'][0]['displayTitle'] : $movie->getMetaData()['Stream']['SubTitle'][0]['title']; ?>
+                                            <?php else: ?>
+                                                Aucun
+                                            <?php endif;?>
+                                        </span>
+                                    </div>
                                 </div>
                             </div>
                             <div class="PrePlaySummary-summary-1NL8g">
diff --git a/fuel/app/views/movie/episode.php b/fuel/app/views/movie/episode.php
index 14aa8c6..9cdae64 100644
--- a/fuel/app/views/movie/episode.php
+++ b/fuel/app/views/movie/episode.php
@@ -15,11 +15,11 @@
     <div class="PageHeaderRight-pageHeaderRight-2CT0g">
         <div class="pageHeaderToolbar-toolbarContainer-2N-IJ Measure-container-2XznZ">
             <div class="pageHeaderToolbar-toolbar-1lW-M">
-                <button id="id-239" data-original-title="Lire" data-toggle="tooltip" role="button"
+                <button id="id-239" data-original-title="Play" data-toggle="tooltip" role="button"
                         class="ToolbarButton-toolbarButton-3xzHJ Link-link-2XYrU Link-default-32xSO      "
                         type="button"><i class="plex-icon-toolbar-play-560"
                                          aria-hidden="true"></i></button>
-                <button id="id-238" data-original-title="Plus..." aria-haspopup="true" data-toggle="tooltip" role="button"
+                <button id="id-238" data-original-title="More..." aria-haspopup="true" data-toggle="tooltip" role="button"
                         class="ToolbarButton-toolbarButton-3xzHJ Link-link-2XYrU Link-default-32xSO      "
                         type="button"><i class="plex-icon-toolbar-more-560"
                                          aria-hidden="true"></i></button>
@@ -32,7 +32,7 @@
             </div>
         </div>
         <div class="PrePlayPageHeader-divider-WQRk8 PageHeaderDivider-pageHeaderDivider-DvwUq"></div>
-        <button id="id-235" data-original-title="Montrer les affiches" data-toggle="tooltip" role="button"
+        <button id="id-235" data-original-title="Show poster" data-toggle="tooltip" role="button"
                 class="ToolbarButton-toolbarButton-3xzHJ Link-link-2XYrU Link-default-32xSO      " type="button">
             <i class="plex-icon-toolbar-artwork-560" aria-hidden="true"></i></button>
         <div class="PrePlayPageHeader-divider-WQRk8 PageHeaderDivider-pageHeaderDivider-DvwUq"></div>
diff --git a/fuel/app/views/movie/index.php b/fuel/app/views/movie/index.php
index 5e6978f..cac79e5 100644
--- a/fuel/app/views/movie/index.php
+++ b/fuel/app/views/movie/index.php
@@ -5,19 +5,19 @@
     <div class="PageHeaderRight-pageHeaderRight-2CT0g">
         <div class="pageHeaderToolbar-toolbarContainer-2N-IJ Measure-container-2XznZ">
             <div class="pageHeaderToolbar-toolbar-1lW-M">
-                <button id="id-16" title="Lire" data-toggle="tooltip" data-placement="bottom" role="button"
+                <button id="id-16" title="Play" data-toggle="tooltip" data-placement="bottom" role="button"
                         class="ToolbarButton-toolbarButton-3xzHJ Link-link-2XYrU Link-default-32xSO"
                         type="button"><i class="plex-icon-toolbar-play-560" aria-hidden="true"></i>
                 </button>
                 <?php if($movie->trailer !== null) : ?>
-                <button id="id-362" title="Visionner la bande annonce." data-placement="bottom" data-toggle="tooltip" role="button" class="ToolbarButton-toolbarButton-3xzHJ Link-link-2XYrU Link-default-32xSO" type="button">
+                <button id="id-362" title="Watch trailer" data-placement="bottom" data-toggle="tooltip" role="button" class="ToolbarButton-toolbarButton-3xzHJ Link-link-2XYrU Link-default-32xSO" type="button">
                     <i class="plex-icon-toolbar-play-trailer-560" aria-hidden="true"></i>
                 </button>
                 <?php endif; ?>
-                <button id="id-21" title="Marquer comme vu" data-placement="bottom" data-toggle="tooltip" role="button" class="ToolbarButton-toolbarButton-3xzHJ Link-link-2XYrU Link-default-32xSO" type="button">
+                <button id="id-21" title="Mark as read" data-placement="bottom" data-toggle="tooltip" role="button" class="ToolbarButton-toolbarButton-3xzHJ Link-link-2XYrU Link-default-32xSO" type="button">
                     <i class="plex-icon-toolbar-played-toggle-560" aria-hidden="true"></i>
                 </button>
-                <button id="id-15" title="Plus..." aria-haspopup="true" data-placement="bottom" data-toggle="tooltip"
+                <button id="id-15" title="More..." aria-haspopup="true" data-placement="bottom" data-toggle="tooltip"
                         role="button"
                         class="ToolbarButton-toolbarButton-3xzHJ Link-link-2XYrU Link-default-32xSO"
                         type="button"><i class="plex-icon-toolbar-more-560" aria-hidden="true"></i>
@@ -31,7 +31,7 @@
             </div>
         </div>
         <div class="PrePlayPageHeader-divider-WQRk8 PageHeaderDivider-pageHeaderDivider-DvwUq"></div>
-        <button id="id-14" title="Montrer les affiches" data-placement="bottom" data-toggle="tooltip" role="button"
+        <button id="id-14" title="Show poster" data-placement="bottom" data-toggle="tooltip" role="button"
                 class="ToolbarButton-toolbarButton-3xzHJ Link-link-2XYrU Link-default-32xSO" type="button">
             <i class="plex-icon-toolbar-artwork-560" aria-hidden="true"></i></button>
     </div>
@@ -66,7 +66,14 @@
                             </div>
                         </div>
                     </div>
-                    <?php if($movie->getMetaData()['Media']['@attributes']['videoResolution'] >= '720') : ?>
+                    <?php if($movie->trailer !== null) : ?>
+                    <div style="font-size: 20px;padding: 0;" class="col-sm-12 text-center">
+                        <button id="id-362" class="Link-link-2XYrU Link-default-32xSO" style="background: #dc3535;border-radius: 3px;padding: 0 7px;width: 100%;margin-top: 15px;">
+                            <i class="glyphicon video-hd"></i> Watch Trailer
+                        </button>
+                    </div>
+                    <?php endif; ?>
+                    <?php if((int)$movie->getMetaData()['Media']['@attributes']['videoResolution'] >= 720) : ?>
                         <div class="col-sm-4 text-center" style="font-size: 35px;"><i class="glyphicon video-hd"></i></div>
                     <?php else: ?>
                         <div class="col-sm-4 text-center" style="font-size: 35px;"><i class="glyphicon video-sd"></i></div>
diff --git a/fuel/app/views/movie/movie.php b/fuel/app/views/movie/movie.php
index b45c446..17fb54b 100644
--- a/fuel/app/views/movie/movie.php
+++ b/fuel/app/views/movie/movie.php
@@ -5,10 +5,10 @@
     <div class="PageHeaderRight-pageHeaderRight-2CT0g">
         <div class="pageHeaderToolbar-toolbarContainer-2N-IJ Measure-container-2XznZ">
             <div class="pageHeaderToolbar-toolbar-1lW-M">
-                <button id="id-16" data-original-title="Lire" data-toggle="tooltip" role="button"
+                <button id="id-16" data-original-title="Play" data-toggle="tooltip" role="button"
                         class="ToolbarButton-toolbarButton-3xzHJ Link-link-2XYrU Link-default-32xSO"
                         type="button"><i class="plex-icon-toolbar-play-560" aria-hidden="true"></i></button>
-                <button id="id-15" data-original-title="Plus..." aria-haspopup="true" data-toggle="tooltip"
+                <button id="id-15" data-original-title="More..." aria-haspopup="true" data-toggle="tooltip"
                         role="button"
                         class="ToolbarButton-toolbarButton-3xzHJ Link-link-2XYrU Link-default-32xSO"
                         type="button"><i class="plex-icon-toolbar-more-560" aria-hidden="true"></i></button>
@@ -21,7 +21,7 @@
             </div>
         </div>
         <div class="PrePlayPageHeader-divider-WQRk8 PageHeaderDivider-pageHeaderDivider-DvwUq"></div>
-        <button id="id-14" data-original-title="Montrer les affiches" data-toggle="tooltip" role="button"
+        <button id="id-14" data-original-title="Show poster" data-toggle="tooltip" role="button"
                 class="ToolbarButton-toolbarButton-3xzHJ Link-link-2XYrU Link-default-32xSO" type="button">
             <i class="plex-icon-toolbar-artwork-560" aria-hidden="true"></i></button>
     </div>