diff --git a/classes/Config.php b/classes/Config.php
index 1f73e6b..be22a3e 100644
--- a/classes/Config.php
+++ b/classes/Config.php
@@ -38,7 +38,7 @@ class Config
      *
      * @var array
      */
-    public $params = ['--no-warnings', '--ignore-errors'];
+    public $params = ['--no-warnings', '--ignore-errors', '--flat-playlist'];
 
     /**
      * Enable audio conversion.
diff --git a/templates/playlist.tpl b/templates/playlist.tpl
index 670bc36..f6c9f22 100644
--- a/templates/playlist.tpl
+++ b/templates/playlist.tpl
@@ -8,12 +8,20 @@
 </p>
 {foreach $video->entries as $video}
     <div class="playlist-entry">
-        <img class="thumb" src="{$video->thumbnail}" alt="" width="200" />
-        <h3><a target="_blank" href="{$video->webpage_url}">{$video->title}</a></h3>
-        <a target="_blank" class="downloadBtn" href="{path_for name="redirect"}?url={$video->webpage_url}">Download</a>
-        {if count($video->formats) > 1}
-            <a target="_blank" href="{path_for name="video"}?url={$video->webpage_url}">More options</a>
-        {/if}
+        <h3><a target="_blank" href="{strip}
+                {if isset($video->ie_key) and $video->ie_key == Youtube and !filter_var($video->url, FILTER_VALIDATE_URL)}
+                    https://www.youtube.com/watch?v=
+                {/if}
+                {$video->url}
+            {/strip}">
+            {if !isset($video->title) and $video->ie_key == YoutubePlaylist}
+                Playlist
+            {else}
+                {$video->title}
+            {/if}
+        </a></h3>
+        <a target="_blank" class="downloadBtn" href="{path_for name="redirect"}?url={$video->url}">Download</a>
+        <a target="_blank" href="{path_for name="video"}?url={$video->url}">More options</a>
     </div>
 {/foreach}