diff --git a/src/controllers/modals/EditSnippetModalController.js b/src/controllers/modals/EditSnippetModalController.js
index 67f0d48e..883a725d 100644
--- a/src/controllers/modals/EditSnippetModalController.js
+++ b/src/controllers/modals/EditSnippetModalController.js
@@ -14,12 +14,12 @@ angular.module('codexen')
         callSign: vm.snippet.callSign,
         mode: vm.snippet.mode == null ? null : vm.snippet.mode.toLowerCase(),
         content: vm.snippet.content,
-        tags: angular.isArray(vm.snippet.tags) ? vm.snippet.tags.map(function (tag) { return {_id: tag._id, name: tag.name} }) : []
+        tags: angular.isArray(vm.snippet.tags) ? vm.snippet.tags.map(function (tag) { return tag.name }) : []
       }
 
       Snippet.update(vm.snippet._id, params)
         .success(function (data) {
-          $modalInstance.close(data.snippet)
+          $modalInstance.close(data)
           console.log('snippet created!', data)
         })
     }
diff --git a/src/controllers/modals/NewSnippetModalController.js b/src/controllers/modals/NewSnippetModalController.js
index 39d22e4c..dc7123ed 100644
--- a/src/controllers/modals/NewSnippetModalController.js
+++ b/src/controllers/modals/NewSnippetModalController.js
@@ -11,12 +11,12 @@ angular.module('codexen')
         callSign: vm.callSign,
         mode: vm.mode == null ? null : vm.mode.toLowerCase(),
         content: vm.content,
-        tags: angular.isArray(vm.tags) ? vm.tags.map(function (tag) { return {_id: tag._id, name: tag.name} }) : []
+        tags: angular.isArray(vm.tags) ? vm.tags.map(function (tag) { return tag.name }) : []
       }
 
       Snippet.create(params)
         .success(function (data) {
-          $modalInstance.close(data.snippet)
+          $modalInstance.close(data)
         })
     }
 
diff --git a/src/controllers/states/SnippetsDetailController.js b/src/controllers/states/SnippetsDetailController.js
index ca0b9965..cb804b34 100644
--- a/src/controllers/states/SnippetsDetailController.js
+++ b/src/controllers/states/SnippetsDetailController.js
@@ -7,14 +7,16 @@ angular.module('codexen')
 
     var snippetId = $state.params.id
 
-    Snippet.show(snippetId)
+    Snippet.show(snippetId, {
+      'include': ['Tag']
+    })
     .success(function (data) {
-      vm.snippet = data.snippet
+      vm.snippet = data
       vm.isLoaded = true
     })
 
     vm.delete = function () {
-      Snippet.delete(vm.snippet._id)
+      Snippet.delete(vm.snippet.id)
       .success(function () {
         $rootScope.$broadcast('snippetDeleted')
       })
diff --git a/src/controllers/states/SnippetsListController.js b/src/controllers/states/SnippetsListController.js
index 95754a5d..dfd2d7b4 100644
--- a/src/controllers/states/SnippetsListController.js
+++ b/src/controllers/states/SnippetsListController.js
@@ -7,13 +7,13 @@ angular.module('codexen')
 
     var loadSnippets = function () {
       if ($auth.isAuthenticated) {
-        console.log($auth.getPayload())
-        var userId = $auth.getPayload().sub
-        Snippet.findByUser(userId)
+        Snippet.findMine({
+          'include': ['Tag']
+        })
           .success(function (data) {
-            console.log('snippets fetched', data.snippets)
+            console.log('snippets fetched', data)
             vm.isLoaded = true
-            vm.snippets = data.snippets
+            vm.snippets = data
             vm.isGuest = false
           })
       }else {
diff --git a/src/services/snippet.js b/src/services/snippet.js
index 08094dfb..23e204f6 100644
--- a/src/services/snippet.js
+++ b/src/services/snippet.js
@@ -11,16 +11,22 @@ angular.module('codexen')
       })
     }
 
+    var findMine = function (params) {
+      var url = apiUrl + 'snippets/my'
+
+      return $http.get(url, {params: params})
+    }
+
     var create = function (params) {
       var url = apiUrl + 'snippets/create'
 
       return $http.post(url, params)
     }
 
-    var show = function (id) {
+    var show = function (id, params) {
       var url = apiUrl + 'snippets/id/' + id
 
-      return $http.get(url)
+      return $http.get(url, {params: params})
     }
 
     var update = function (id, params) {
@@ -37,6 +43,7 @@ angular.module('codexen')
 
     return {
       findByUser: findByUser,
+      findMine: findMine,
       create: create,
       show: show,
       delete: destroy,
diff --git a/src/styles/_index.styl b/src/styles/_index.styl
index 8bcfe095..b19f0eca 100644
--- a/src/styles/_index.styl
+++ b/src/styles/_index.styl
@@ -28,7 +28,7 @@ textarea
   left: 0
   width: 200px
   background-color: $baseBackgroundColor
-  border-right solid 1px $baseBorderColor
+  border-right solid 2px $backgroundColorSelected
   box-sizing: border-box
   padding: 10px 0 10px 10px
 
diff --git a/src/styles/directives/side-nav.styl b/src/styles/directives/side-nav.styl
index b9e14810..5bfe6797 100644
--- a/src/styles/directives/side-nav.styl
+++ b/src/styles/directives/side-nav.styl
@@ -2,6 +2,7 @@
   .nav-control-group
     margin 0 5px
   ul.nav.nav-pills
+    margin-top 10px
     li hr
       margin: 5px 0
       border-top none
diff --git a/src/tpls/directives/side-nav.tpl.html b/src/tpls/directives/side-nav.tpl.html
index 9710a7aa..d3a46558 100644
--- a/src/tpls/directives/side-nav.tpl.html
+++ b/src/tpls/directives/side-nav.tpl.html
@@ -3,8 +3,8 @@
     <img width="30" class="img-circle" ng-src="http://www.gravatar.com/avatar/{{ vm.currentUser.email | gravatar }}">
     <a href ng-bind="vm.currentUser.name"></a>
     <span class="nav-control-group pull-right">
-      <a href class="btn btn-sm btn-primary"><i class="fa fa-gears"></i></a>
-      <a href class="btn btn-sm btn-primary" ng-click="vm.signOut()"><i class="fa fa-sign-out"></i></a>
+      <a href class="btn btn-sm btn-default"><i class="fa fa-gears"></i></a>
+      <a href class="btn btn-sm btn-default" ng-click="vm.signOut()"><i class="fa fa-sign-out"></i></a>
     </span>
 
   </div>
diff --git a/src/tpls/modals/edit-snippet-modal.tpl.html b/src/tpls/modals/edit-snippet-modal.tpl.html
index 9d96ea24..8d6c1a8e 100644
--- a/src/tpls/modals/edit-snippet-modal.tpl.html
+++ b/src/tpls/modals/edit-snippet-modal.tpl.html
@@ -22,7 +22,8 @@
       <div
         ui-ace="{
           mode: vm.snippet.mode.toLowerCase(),
-          theme:'solarized_dark'
+          theme:'solarized_dark',
+          useWrapMode : true
 
         }"
         ng-model="vm.snippet.content"
@@ -30,7 +31,7 @@
     </div>
 
     <div class="form-group">
-      <ui-select multiple tagging="vm.transform" tagging-tokens="SPACE|,|/" ng-model="vm.snippet.tags" theme="bootstrap">
+      <ui-select multiple tagging="vm.transform" tagging-tokens="SPACE|,|/" ng-model="vm.snippet.Tags" theme="bootstrap">
         <ui-select-match placeholder="Write Tags">{{$item.name}}</ui-select-match>
         <ui-select-choices repeat="tag in vm.tagCandidates" refresh="vm.refreshTagCandidates($select.search)"
          refresh-delay="200">
diff --git a/src/tpls/modals/new-snippet-modal.tpl.html b/src/tpls/modals/new-snippet-modal.tpl.html
index e1a44f02..7326fdad 100644
--- a/src/tpls/modals/new-snippet-modal.tpl.html
+++ b/src/tpls/modals/new-snippet-modal.tpl.html
@@ -22,7 +22,8 @@
       <div
         ui-ace="{
           mode: vm.mode.toLowerCase(),
-          theme:'solarized_dark'
+          theme:'solarized_dark',
+          useWrapMode : true
 
         }"
         ng-model="vm.content"
diff --git a/src/tpls/states/snippets.detail.tpl.html b/src/tpls/states/snippets.detail.tpl.html
index faad1a63..b00cf739 100644
--- a/src/tpls/states/snippets.detail.tpl.html
+++ b/src/tpls/states/snippets.detail.tpl.html
@@ -3,7 +3,7 @@
   <div class="detail-header">
     <span class="detail-header-title">
       <span ng-bind="vm.snippet.callSign"></span>
-      <small><span ng-bind="snippet.updatedAt|fromNow"></span> <i class="fa fa-clock-o"></i></small>
+      <small><span ng-bind="vm.snippet.updatedAt|fromNow"></span> <i class="fa fa-clock-o"></i></small>
     </span>
     <span class="detail-header-control pull-right">
       <button type="button" name="button" class="btn btn-default"><i class="fa fa-share"></i></button>
@@ -20,12 +20,13 @@
 
     <div ng-if="vm.isLoaded" class="">
       <p ng-bind="vm.snippet.description"></p>
-      <div tags="vm.snippet.tags"></div>
+      <div tags="vm.snippet.Tags"></div>
       <div ui-ace="{
         showGutter: false,
         useWrapMode : true,
         mode:vm.snippet.mode.toLowerCase(),
         maxLines: -1,
+        theme:'solarized_dark',
         rendererOptions: {
             maxLinks: Infinity
         }
diff --git a/src/tpls/states/snippets.list.tpl.html b/src/tpls/states/snippets.list.tpl.html
index 2b995019..d8579726 100644
--- a/src/tpls/states/snippets.list.tpl.html
+++ b/src/tpls/states/snippets.list.tpl.html
@@ -26,7 +26,7 @@
         <a ui-sref="auth.signin" class="btn btn-default"><i class="fa fa-signin"></i> Sign In</a>
       </li>
 
-      <li ng-repeat="snippet in vm.snippets | filter:vm.search" ui-sref="snippets.detail({id:snippet._id})" ui-sref-active="active">
+      <li ng-repeat="snippet in vm.snippets | filter:vm.search" ui-sref="snippets.detail({id:snippet.id})" ui-sref-active="active">
         <div class="media">
           <div class="media-left">
             <img width="25" height="25" src="http://www.gravatar.com/avatar/ea0b6ad1c11700120d1af08810caa19d" alt="" />
@@ -41,7 +41,7 @@
             </p>
           </div>
         </div>
-        <div tags="snippet.tags"></div>
+        <div tags="snippet.Tags"></div>
       </li>
     </ul>
   </div>