diff --git a/client/app/components/comments/comments.html b/client/app/components/comments/comments.html
new file mode 100644
index 0000000..15ade5f
--- /dev/null
+++ b/client/app/components/comments/comments.html
@@ -0,0 +1,37 @@
+<div class="panel">
+    <div class="panel-heading">
+        Comments
+    </div>
+    <div class="panel-body">
+        <ul class="media-list media-feed media-feed-hover">
+            <li>
+                <section class="panel">
+                    <form>
+                        <textarea placeholder="Rate me, validate me, trash me?" rows="2"
+                                  class="form-control input-lg p-text-area" ng-model="newComment">
+                        </textarea>
+                    </form>
+                    <footer class="panel-footer" style="height: 64px;">
+                        <button class="btn btn-danger pull-right" ng-click="postComment()" >Post</button>
+                    </footer>
+                </section>
+            </li>
+            <li ng-repeat="comment in comments" ng-animate="'animate'" class="media"><a class="pull-left"><img ng-src="{{comment.avatar_image}}" alt="{{comment.user.display_name}}" class="img-circle user-profile-insert-medium"/></a>
+                <div class="media-body">
+                    <p class="push-bit">
+                        <span class="text-muted pull-right">
+                            <small>{{comment.date_created|humanise}}</small>
+                        </span>
+                        <strong><a ui-sref="root.user({user: comment.slug})">{{comment.display_name}}</a> commented.</strong>
+                    </p>
+                    <p>{{comment.comment}}</p>
+                    <p ng-if="comment.can_edit">
+                        <a ng-click="deleteComment(comment)" class="btn btn-xs btn-default">
+                            <i class="fa fa-remove"></i> Delete
+                        </a>
+                    </p>
+                </div>
+            </li>
+        </ul>
+    </div>
+</div>
\ No newline at end of file
diff --git a/client/app/components/comments/comments.jade b/client/app/components/comments/comments.jade
deleted file mode 100644
index b5712ac..0000000
--- a/client/app/components/comments/comments.jade
+++ /dev/null
@@ -1,45 +0,0 @@
-.block
-    .block-title
-        h2
-            strong Comments
-    .block-content-full
-        // You can remove the class .media-feed-hover if you don't want each event to be highlighted on mouse hover
-        ul.media-list.media-feed.media-feed-hover
-            li.media
-                form.form-horizontal
-                    .form-group
-                        .col-xs-12
-                            textarea.form-control(ng-model="newComment" rows='4' placeholder='Compose a comment..')
-                    .form-group
-                        .col-xs-6
-                            .btn-group(ng-show="false")
-                                button.btn.btn-default(type='button' tooltip data-toggle='tooltip' title='Add Image')
-                                    i.fa.fa-picture-o
-                                button.btn.btn-default(type='button' tooltip data-toggle='tooltip' title='Add Location')
-                                    i.fa.fa-location-arrow
-                                button.btn.btn-default(type='button' tooltip data-toggle='tooltip' title='Add Recording')
-                                    i.fa.fa-microphone
-                        .col-xs-6.text-right
-                            button.btn.btn-default(type='submit' ng-click="postComment()")
-                                i.fa.fa-pencil
-                                |  POST
-            li.media(ng-repeat="comment in comments" ng-animate="'animate'")
-                a.pull-left()
-                    img.img-circle.user-profile-insert-medium(ng-src='{{comment.avatar_image}}', alt='{{comment.user.display_name}}')
-                .media-body
-                    p.push-bit
-                        span.text-muted.pull-right
-                            small {{comment.date_created|humanise}}
-                            span.text-info()
-                                i.fa.fa-globe
-                        strong
-                            a(ui-sref='root.user({user: comment.slug})') {{comment.display_name}}
-                            |  commented.
-                    p {{comment.comment}}
-                    p
-                        a.btn.btn-xs.btn-default(href='javascript:void(0)')
-                            i.fa.fa-thumbs-o-up
-                            |  Like
-                        a.btn.btn-xs.btn-default(ng-click='deleteComment(comment)')
-                            i.fa.fa-remove
-                            |  Delete
diff --git a/client/app/components/navbar/navbar.html b/client/app/components/navbar/navbar.html
index 19e9cf5..8651cca 100755
--- a/client/app/components/navbar/navbar.html
+++ b/client/app/components/navbar/navbar.html
@@ -7,7 +7,7 @@
 </div>
 <div class="top-nav visible-md visible-lg">
     <ul class="nav top-menu top-nav-buttons">
-        <li id="navbar-upload-button">
+        <li id="navbar-upload-button" ng-show="$root.currentUser">
             <a ui-sref="root.upload">
                 <i class="fa fa-cloud-upload"></i>
                 <span>Upload</span>
diff --git a/client/app/directives/audio/audio.player.html b/client/app/directives/audio/audio.player.html
index bcfd10a..3775864 100644
--- a/client/app/directives/audio/audio.player.html
+++ b/client/app/directives/audio/audio.player.html
@@ -8,44 +8,54 @@
                 <dss-waveform class="hidden-xs"></dss-waveform>
             </div>
         </div>
-        <div class="row pull-right">
-            <div class="btn-group btn-group-xs">
-                <button ng-click="shareEmbed()" class="btn btn-small"><i
-                        class="fa fa-wordpress blue"></i></button>
-                <button ng-click="shareFacebook()" class="btn btn-small"><i
-                        class="fa fa-facebook-square blue"></i></button>
-                <button class="btn btn-small">
-                    <i ng-click="shareTwitter()" class="fa fa-twitter-square"></i>
-                </button>
+        <div class="row">
+            <div class="pull-left fb-user-details">
+                <a ui-sref="root.user({user: mix.user.slug})">{{mix.user.display_name}}</a>
             </div>
-            <div class="btn-group btn-group-xs">
-                <button uib-tooltip="Plays" class="btn btn-small">
-                    <i class="fa fa-play-circle"></i>
-                    {{ mix.plays.length }}
-                </button>
-                <button ng-show="$root.currentUser && mix.is_downloadable" ng-click="downloadFile()"
-                        uib-tooltip="Download"
-                        class="btn btn-sm">
-                    <i class="fa fa-download"></i>
-                    {{ mix.downloads.length }}
-                </button>
-                <button ng-show="!$root.currentUser && mix.is_downloadable" uib-tooltip="Login to download"
-                        ng-click="login()" class="btn btn-sm">
-                    <i class="fa fa-download"></i>
-                    {{ mix.downloads.length }}
-                </button>
-                <a ng-click="toggleLike()"
-                   ng-class="mix.is_liked ? 'btn-danger' : 'btn-success'"
-                   uib-tooltip="{{mix.is_liked ? 'Unlike' : 'Like'}}"
-                   class="btn btn-alt btn-sm btn-default"><i
-                        class="fa fa-heart"></i>{{ mix.likes.length }}
-                </a>
-            </div>
-            <div class="btn-group btn-group-xs">
-                <button ng-click="editMix(mix)" class="btn btn-small btn-success"><i class="fa fa-pencil-square-o"></i>Edit
-                </button>
-                <button ng-click="deleteMix(mix)" class="btn btn-small btn-danger"><i class="fa fa-times"></i>Delete
-                </button>
+            <div class="pull-right">
+                <div class="btn-group btn-group-xs">
+                    <button ng-click="shareEmbed()" class="btn btn-small" uib-tooltip="Get embed codes">
+                        <i class="fa fa-wordpress blue"></i>
+                    </button>
+                    <button ng-click="shareFacebook()" class="btn btn-small" uib-tooltip="Share to Facebook">
+                        <i class="fa fa-facebook-square blue"></i>
+                    </button>
+                    <button class="btn btn-small" uib-tooltip="Share to Twitter">
+                        <i ng-click="shareTwitter()" class="fa fa-twitter-square"></i>
+                    </button>
+                </div>
+                <div class="btn-group btn-group-xs">
+                    <button uib-tooltip="Plays" class="btn btn-small">
+                        <i class="fa fa-play-circle"></i>
+                        {{ mix.plays.length }}
+                    </button>
+                    <button ng-show="$root.currentUser && mix.is_downloadable" ng-click="downloadFile()"
+                            uib-tooltip="Download"
+                            class="btn btn-sm">
+                        <i class="fa fa-download"></i>
+                        {{ mix.downloads.length }}
+                    </button>
+                    <button ng-show="!$root.currentUser && mix.is_downloadable" uib-tooltip="Login to download"
+                            ng-click="login()" class="btn btn-sm">
+                        <i class="fa fa-download"></i>
+                        {{ mix.downloads.length }}
+                    </button>
+                </div>
+                <div class="btn-group btn-group-xs" ng-show="$root.currentUser">
+                    <a ng-click="toggleLike()"
+                       ng-class="mix.is_liked ? 'btn-danger' : 'btn-success'"
+                       uib-tooltip="{{mix.is_liked ? 'Unlike' : 'Like'}}"
+                       class="btn btn-alt btn-sm btn-default">
+                        <i class="fa fa-heart"></i>{{ mix.likes.length }}
+                    </a>
+                </div>
+                <div class="btn-group btn-group-xs" ng-if="mix.can_edit">
+                    <button ng-click="editMix(mix)" class="btn btn-small btn-success"><i
+                            class="fa fa-pencil-square-o"></i>Edit
+                    </button>
+                    <button ng-click="deleteMix(mix)" class="btn btn-small btn-danger"><i class="fa fa-times"></i>Delete
+                    </button>
+                </div>
             </div>
         </div>
     </div>
diff --git a/client/app/views/mixes/item/mix.html b/client/app/views/mixes/item/mix.html
new file mode 100644
index 0000000..cfc73b6
--- /dev/null
+++ b/client/app/views/mixes/item/mix.html
@@ -0,0 +1,22 @@
+<div class="row mix-audio-container">
+    <div id="mix-audio-container" class="col-md-12">
+        <dss-audio-player template="directives/audio/audio.player.html"></dss-audio-player>
+    </div>
+</div>
+<hr />
+<div class="row">
+    <div class="col-sm-6">
+        <section class="panel">
+            <header class="panel-heading">
+                {{mix.title}}
+            </header>
+            <div class="panel-body">
+                <span ng-bind-html="mix.description | dssHtml"></span>
+
+            </div>
+        </section>
+    </div>
+    <div class="col-sm-6">
+        <dss-comments></dss-comments>
+    </div>
+</div>
\ No newline at end of file
diff --git a/client/app/views/mixes/item/mix.jade b/client/app/views/mixes/item/mix.jade
deleted file mode 100644
index 7d9b9c1..0000000
--- a/client/app/views/mixes/item/mix.jade
+++ /dev/null
@@ -1,15 +0,0 @@
-.row.mix-audio-container
-    .col-md-12#mix-audio-container
-        dss-audio-player(template='directives/audio/audio.player.html')
-.row
-    .col-sm-6
-        .block.full.dss-mix-item
-            .block-title
-                .block-options.pull-right
-                    a.btn.btn-sm.btn-alt.btn-default(data-toggle='tooltip', title='Description' ng-show="false")
-                        i.fa.fa-ticket
-                h2
-                    strong Description
-            span(ng-bind-html='mix.description | dssHtml')
-    .col-sm-6
-        dss-comments
diff --git a/client/app/views/mixes/mixes.less b/client/app/views/mixes/mixes.less
index 1123368..75199bd 100755
--- a/client/app/views/mixes/mixes.less
+++ b/client/app/views/mixes/mixes.less
@@ -110,7 +110,7 @@
 }
 
 .image-container {
-  height: 142px;
+  height: 160px;
   //background-repeat: no-repeat;
   display: flex;
   justify-content: center;
diff --git a/package.json b/package.json
index 65ca2e6..a3d1e87 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dssweb",
-  "version": "4.0.2",
+  "version": "4.0.3",
   "main": "server/app.js",
   "dependencies": {
     "body-parser": "~1.5.0",