diff --git a/electron_src/popup/index.html b/electron_src/popup/index.html
index 94fdba98..d8152d8d 100644
--- a/electron_src/popup/index.html
+++ b/electron_src/popup/index.html
@@ -20,8 +20,8 @@
     </div>
 
     <div class="result-block row-fluid">
-      <ul id="result-list" class="result-list left-pane" ng-class="{focused:isFocusing == 2}">
-        <li ng-click="selectSnippet($index)" ng-repeat="snippet in filteredSnippets" ng-class="{active:$index == selectIndex}"><a href="#">{{snippet.description}}</a></li>
+      <ul id="result-list" class="result-list left-pane">
+        <li ng-click="selectSnippet($index)" ng-repeat="snippet in filteredSnippets" ng-class="{active:$index == selectIndex}"><a href="#"> <span ng-bind="snippet.callSign"></span> <small ng-bind="snippet.description"></small></a></li>
       </ul>
 
       <div class="right-pane">
diff --git a/electron_src/styles/_popup.styl b/electron_src/styles/_popup.styl
index 2239e236..9f3e25e5 100644
--- a/electron_src/styles/_popup.styl
+++ b/electron_src/styles/_popup.styl
@@ -24,7 +24,7 @@
     .result-list
       list-style:none
       padding: 0
-      border-right: 1px solid $border-color
+      border-right: 1px solid $baseBorderColor
       li
         &:nth-child(even)
           background-color $baseBackgroundColor
diff --git a/main.js b/main.js
index 62aa2da4..d2e3e55f 100644
--- a/main.js
+++ b/main.js
@@ -220,8 +220,8 @@ app.on('ready', function () {
   function makeNewMainWindow () {
     console.log('new Window!')
     mainWindow = new BrowserWindow({
-      width: 800,
-      height: 600,
+      width: 920,
+      height: 640,
       'web-preferences': {
           'overlay-scrollbars': true
         }
diff --git a/src/controllers/states/SnippetsDetailController.js b/src/controllers/states/SnippetsDetailController.js
index 8c35b6af..a2beb7f8 100644
--- a/src/controllers/states/SnippetsDetailController.js
+++ b/src/controllers/states/SnippetsDetailController.js
@@ -7,9 +7,7 @@ angular.module('codexen')
 
     var snippetId = $state.params.id
 
-    Snippet.show(snippetId, {
-      'include': ['Tag']
-    })
+    Snippet.show(snippetId)
       .success(function (data) {
         vm.snippet = data
         vm.isLoaded = true
diff --git a/src/controllers/states/SnippetsListController.js b/src/controllers/states/SnippetsListController.js
index 179aded2..83f75763 100644
--- a/src/controllers/states/SnippetsListController.js
+++ b/src/controllers/states/SnippetsListController.js
@@ -74,9 +74,7 @@ angular.module('codexen')
 
     function loadSnippets() {
       if ($auth.isAuthenticated) {
-        Snippet.findMine({
-          'include': ['Tag']
-        })
+        Snippet.findMine()
           .success(function (data) {
             vm.snippets = data
           })
diff --git a/src/styles/states/snippets.styl b/src/styles/states/snippets.styl
index 9ec65a2c..e0e5635a 100644
--- a/src/styles/states/snippets.styl
+++ b/src/styles/states/snippets.styl
@@ -88,32 +88,43 @@ $snippet-list-active-bg= $brand-primary
 
 
 .snippets-detail-state
+  position absolute
+  top 0
+  width 100%
+  bottom 0
+  overflow hidden
   .detail-header
+    position absolute
+    top 0
+    width 100%
     background-color lighten($baseBackgroundColor, 5%)
-    padding: 5px 10px
-    height: 50px
-    border-bottom: solid 1px $baseBorderColor
+    padding 5px 10px
+    height 50px
+    border-bottom solid 1px $baseBorderColor
     .detail-header-title
-      color: $textColorHighlight
+      color $textColorHighlight
+      line-height 40px
+      font-size 1.2em
       small
         font-size: 0.6em
-        color: $textColor
+        color $textColor
 
-      line-height: 40px
-      font-size: 1.2em
 
     .detail-header-control
-      padding:3px
-
+      padding 3px
 
   .detail-body
-    padding: 5px 10px
+    position absolute
+    top 50px
+    width 100%
+    bottom 0
+    padding 5px 10px
+    overflow-y auto
     .ace_editor
-      min-height: 300px
-      border: solid 1px $border-color
-      border-radius: 5px
-
-
+      min-height 300px
+      border solid 1px $border-color
+      border-radius 5px
+      margin-bottom 5px
 
 .tags
   word-break: break-all
diff --git a/src/tpls/states/auth.tpl.html b/src/tpls/states/auth.tpl.html
index e1f934d1..439fd2e4 100644
--- a/src/tpls/states/auth.tpl.html
+++ b/src/tpls/states/auth.tpl.html
@@ -1,6 +1,6 @@
 <div class="auth-state container-fluid">
   <div class="row">
-    <div class="col-sm-6 col-sm-offset-3 panel panel-default">
+    <div class="col-xs-10 col-xs-offset-1 col-sm-8 col-sm-offset-2 col-lg-6 col-lg-offset-3 panel panel-default">
 
       <div class="text-center">