diff --git a/client/app/components/navbar/navbar.html b/client/app/components/navbar/navbar.html
index 04ba1ea..744a9ec 100755
--- a/client/app/components/navbar/navbar.html
+++ b/client/app/components/navbar/navbar.html
@@ -5,21 +5,6 @@
 <div class="nav notify-row" id="top_menu">
     <ul class="nav top-menu" ng-show="$root.currentUser">
         <dss-notifications/>
-        <li><a ui-sref="root.upload">
-            <i class="fa fa-cloud-upload"></i>
-            <span>Upload</span>
-        </a>
-        </li>
-        <li><a ui-sref="root.upload">
-            <i class="fa fa-cloud-upload"></i>
-            <span>Upload</span>
-        </a>
-        </li>
-        <li><a ui-sref="root.upload">
-            <i class="fa fa-cloud-upload"></i>
-            <span>Upload</span>
-        </a>
-        </li>
         <li style="padding-left: 52px;">
             <a ui-sref="root.upload">
                 <i class="fa fa-cloud-upload"></i>
diff --git a/client/app/oldnavbar.html b/client/app/oldnavbar.html
deleted file mode 100644
index 6638270..0000000
--- a/client/app/oldnavbar.html
+++ /dev/null
@@ -1,104 +0,0 @@
-<nav class="navbar navbar-default" role="navigation" id="navigation">
-    <div class="navbar-header">
-        <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#collapse-menu">
-            <span class="sr-only">Toggle navigation</span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-        </button>
-        <a class="navbar-brand" ui-sref="root" id="brand">Deep|South|Sounds</a>
-    </div>
-    <div class="collapse navbar-collapse" id="collapse-menu">
-        <ul class="nav navbar-nav">
-            <li ui-sref-active="active" ng-if="$root.currentUser">
-                <a ui-sref="root.upload">
-                    <i class="fa fa-cloud-upload"></i>
-                    <span>Upload</span>
-                </a>
-            </li>
-        </ul>
-        <div class="col-sm-6 col-md-6">
-            <form class="navbar-form" role="search">
-                <div class="input-group">
-                    <input type="text" ng-model="selected" placeholder="Search..."
-                           uib-typeahead="result for results in getSearchResults($viewValue)"
-                           typeahead-template-url="app/views/templates/searchResult.html"
-                           typeahead-loading="loadingSearchResults"
-                           class="form-control navbar-search"/>
-                    <div class="input-group-btn">
-                        <button class="btn btn-default" type="submit"><i class="fa fa-search"></i>
-                        </button>
-                    </div>
-                </div>
-            </form>
-        </div>
-        <ul class="nav navbar-nav navbar-right">
-            <li id="navbar-radio-dropdown" class="dropdown">
-                <a href="#" class="dropdown-toggle navbar-button" data-toggle="dropdown" uib-tooltip="Live">
-                    <span class="fa fa-1-3x fa-microphone">&nbsp;Radio</span>
-                </a>
-                <ul class="dropdown-menu">
-                    <li class="radio-player-dropdown">
-                        <dss-radio-player />
-                    </li>
-                </ul>
-            </li>
-
-            <li id="navbar-notification-dropdown" class="dropdown" ng-if="$root.currentUser">
-                <a href="#" class="dropdown-toggle navbar-button" data-toggle="dropdown" id="notifications-button">
-                    <span class="fa fa-1-3x fa-envelope"></span>
-                    <span ng-if="notificationCount > 0" class="label label-lightred notification-label">{{notificationCount}}</span>
-                </a>
-                <ul class="dropdown-menu message-ul navbar-notification">
-                    <dss-notifications/>
-                </ul>
-            </li>
-            <li id="navbar-profile-dropdown" class="dropdown" ng-if="$root.currentUser">
-                <a href="#" class="dropdown-toggle navbar-profile-dropdown" data-toggle="dropdown">{{
-                    $root.currentUser.display_name }}
-                    <b class="caret"></b>
-                    <img class="navbar-profile-image img-circle" ng-src="{{$root.currentUser.profile_image_small}}"
-                         alt="">
-                </a>
-                <ul class="dropdown-menu">
-                    <li>
-                        <a ui-sref="root.me">View profile</a>
-                    </li>
-                    <li>
-                        <a ui-sref="root.me.edit">Account settings</a>
-                    </li>
-                    <li>
-                        <a href="#" ng-click="logout()">Sign out</a>
-                    </li>
-                </ul>
-            </li>
-            <li class="ms-hover" ng-if="!$root.currentUser">
-                <a href="#" data-toggle="dropdown" class="dropdown-toggle">
-                    Login/Signup
-                    <i class="fa fa-angle-down"></i>
-                </a>
-                <ul class="dropdown-menu">
-                    <li>
-                        <div class="social-buttons">
-                            <ul class="list-nostyle">
-                                <li>
-                                    <a ng-click="doLogin('facebook')" class="btn btn-fb"><i
-                                            class="fa fa-facebook"></i> Facebook</a>
-                                </li>
-                                <li>
-                                    <a ng-click="doLogin('twitter')" class="btn btn-tw"><i
-                                            class="fa fa-twitter"></i> Twitter</a>
-                                </li>
-                                <li>
-                                    <a ng-click="doLogin('google')" class="btn btn-google"><i
-                                            class="fa fa-google"></i>
-                                        Google</a>
-                                </li>
-                            </ul>
-                        </div>
-                    </li>
-                </ul>
-            </li>
-        </ul>
-    </div>
-</nav>
diff --git a/client/scratch.html b/client/scratch.html
index 476b52e..86e1f30 100644
--- a/client/scratch.html
+++ b/client/scratch.html
@@ -1,71 +1,13 @@
-<div id="ap1" style="width:100%; " class="skin-wave skin-wave-mode-normal audioplayer loaded">
-    <div class="audioplayer-inner">
-        <a class="the-thumb-con">
-            <dss-mix-image></dss-mix-image>
-        </a>
-        <div class="ap-controls">
-            <dss-waveform class="hidden-xs"></dss-waveform>
-        </div>
-    </div>
-    <div ng-show="addingComment" class="lower-container add-comment animate-show">
-        <div class="input-group comment-add-form pull-right">
-                    <span class="input-group-btn">
-                        <button type="button" class="btn btn-primary">
-                            <i class="fa fa-pencil"></i>
-                        </button>
-                    </span>
-            <input type="text" placeholder="Add comment"
-                   ng-keyup="$event.keyCode == 13 &amp;&amp; addComment($event)"
-                   ng-show="addingComment"
-                   show-focus="addingComment" class="form-control"/>
-        </div>
-    </div>
-    <div ng-hide="addingComment" class="lower-container mix-details animate-show">
-        <div class="control-container pull-left">
-            <div class="con-controls">
-                <div class="the-bg"></div>
-                <div ng-click="play($event)" class="con-playpause">
-                    <div ng-show="(playState == 0 || playState == 2)" class="playbtn">
-                        <div class="play-icon"></div>
-                        <div class="play-icon-hover"></div>
-                    </div>
-                    <div ng-show="(playState == 1)" class="pausebtn">
-                        <div class="pause-icon">
-                            <div class="pause-part-1"></div>
-                            <div class="pause-part-2"></div>
-                        </div>
-                        <div class="pause-icon-hover"></div>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <div style="left: 56px;" class="hidden-xs">
-            <a ui-sref="root.user({user: mix.user.slug})"
-               class="the-artist ng-binding">
-                {{mix.user.display_name}}
-            </a>
-            <a href="#" ng-click="toggleFollow()" ng-show="currentUser"
-               uib-tooltip="{{mix.user.is_following ? 'Unfollow' : 'Follow'}} {{mix.user.display_name}}">
-                <i class="fa fa-user-plus"
-                   ng-class="mix.user.is_following ? 'text-danger' : 'text-success'"></i>
-            </a>
-            <div class="meta-artist"><span class="the-name ng-binding">{{mix.title}}</span></div>
-        </div>
-
-    </div>
-    <div style="width: 920px; left: 220px;" class="hidden-sm" ng-click="showCommentForm($event)" class="comments-holder active">
-        <div class="the-bg"></div>
-        <span ng-style="{'left': + (comment.time_index/mix.duration) * 100 + '%'}"
-              ng-repeat="comment in comments | filter: { time_index: '!0' }"
-              class="a-comment with-tooltip">
-            <div class="aux-padder"></div>
-            <span style="width: 250px;" class="dzstooltip skin-black">
-                <span class="the-comment-author">@{{comment.user}}</span> says:<br/>{{comment.comment}}
-            </span>
-           <div style="background-image: url({{comment.avatar_image}})" class="the-avatar">
-           </div>
-        </span>
-    </div>
-    <div class="clear"></div>
-</div>
+<li id=navbar-notification-dropdown class=dropdown><a data-toggle=dropdown class=dropdown-toggle href=#><i
+        class="fa fa-envelope-o"></i> <span class="badge bg-important" ng-show="notificationCount != 0">{{notificationCount}}</span></a>
+    <ul class="dropdown-menu extended inbox">
+        <div class="notify-arrow notify-arrow-red"></div>
+        <li><p class=red>You have {{notificationCount}} new notifications</p></li>
+        <li ng-repeat="notification in notifications"
+            ng-class="notification.accepted_date ? \'\' : \'notification-new\'"><a href={{notification.target}}><span
+                class=photo><img alt=avatar ng-src={{notification.from_user.profile_image_small}}></span> <span
+                class=subject><span class=from>{{notification.from_user.first_name}}</span> <span class=time>{{notification.date|humanise}}</span></span>
+            <span class=message>{{notification.verb}}&nbsp;{{notification.target_desc}}</span></a></li>
+        <li><a href=#>See all messages</a></li>
+    </ul>
+</li>
\ No newline at end of file