diff --git a/vrobbler/templates/videos/video_detail.html b/vrobbler/templates/videos/video_detail.html
index 3c8f3be..080bf1c 100644
--- a/vrobbler/templates/videos/video_detail.html
+++ b/vrobbler/templates/videos/video_detail.html
@@ -1,11 +1,9 @@
 {% extends "base_detail.html" %}
 
-{% block title %}{{object.name}}{% endblock %}
+{% block title %}{{object.title}}{% if object.tv_series %} - {{object.tv_series}}{% endif %}{% endblock %}
 
 {% block details %}
-
 <div class="row">
-    <h2>{{object.tv_series}}</h2>
     <div class="col-md">
         <h3>Last scrobbles</h3>
         <div class="table-responsive">
@@ -14,9 +12,11 @@
                     <tr>
                         <th scope="col">Date</th>
                         <th scope="col">Title</th>
+                        {% if object.tv_series %}
                         <th scope="col">Series</th>
                         <th scope="col">Season</th>
                         <th scope="col">Episode</th>
+                        {% endif %}
                     </tr>
                 </thead>
                 <tbody>
@@ -24,9 +24,11 @@
                     <tr>
                         <td>{{scrobble.timestamp}}</td>
                         <td>{{scrobble.video.title}}</td>
+                        {% if object.tv_series %}
                         <td>{{scrobble.video.tv_series}}</td>
                         <td>{{scrobble.video.season_number}}</td>
                         <td>{{scrobble.video.episode_number}}</td>
+                        {% endif %}
                     </tr>
                     {% endfor %}
                 </tbody>
@@ -34,4 +36,4 @@
         </div>
     </div>
 </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}