diff --git a/PageHandlers/templates/view.html b/PageHandlers/templates/view.html
index 14f6c88..dc710e8 100644
--- a/PageHandlers/templates/view.html
+++ b/PageHandlers/templates/view.html
@@ -28,7 +28,7 @@
                 <p style="float: right">{{ .Metadata.LikeCount }} likes | {{ .Metadata.DislikeCount }} dislikes</p>
 
                 <p>{{ .Metadata.ViewCount }} views</p>
-                <p>Uploaded by: <a href="/search?term={{ .Metadata.Channel }}">{{ .Metadata.Channel }}</a></p>
+                <p>Uploaded by: <a href="/search?term={{ .Metadata.Channel }}">{{ .Metadata.Channel }}</a> <a href="{{ .Metadata.ChannelURL }}">[YT]</a></p>
                 <p>Uploaded at: <span id="uploadDate"></span></p>
                 <hr />
 
@@ -40,6 +40,15 @@
                 {{ .Metadata.Description }}
             </div>
 
+
+        {{ end }}
+
+        <p>Youtube ID: {{.Id}}</p>
+        <a href="https://youtube.com/watch?v={{ .Id }}">YouTube Link</a><br />
+        <a href="/videos/{{.Filename}}">Direct video link</a>
+
+        {{ if .Metadata.ChannelID }}
+
             <hr />
 
             <h3>Comments ({{ .Metadata.CommentCount }}):</h3>
@@ -62,12 +71,6 @@
     </div>
     <br />
 
-
-    <p>Filetype: {{.Extension}}</p>
-    <p>Youtube ID: {{.Id}}</p>
-    <p>Filename: {{.Filename}}</p>
-    <a href="/videos/{{.Filename}}">Direct video link</a>
-
     <script src="https://vjs.zencdn.net/7.15.4/video.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/videojs-seek-buttons/dist/videojs-seek-buttons.min.js"></script>
     <script>