diff --git a/app/assets/javascripts/darkswarm/controllers/sidebar_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/sidebar_controller.js.coffee
index cbf7a6710a..0aa5f11683 100644
--- a/app/assets/javascripts/darkswarm/controllers/sidebar_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/sidebar_controller.js.coffee
@@ -4,6 +4,5 @@ window.SidebarCtrl = Darkswarm.controller "SidebarCtrl", ($scope, $location) ->
   , ->
     $scope.active_sidebar = $location.path() 
 
-
   $scope.active = ->
-    return "active" if $scope.active_sidbar != null and $scope.active_sidebar != ""
+    return "active" if $scope.active_sidebar != null and $scope.active_sidebar != ""
diff --git a/app/assets/stylesheets/darkswarm/offcanvas.css b/app/assets/stylesheets/darkswarm/offcanvas.css
index d6837e3ed5..3b823be7a3 100644
--- a/app/assets/stylesheets/darkswarm/offcanvas.css
+++ b/app/assets/stylesheets/darkswarm/offcanvas.css
@@ -1,5 +1,5 @@
 /* Off canvas layout CSS/JS provided by or adapted from work by Jason Weaver and Luke Wroblewski Requires globals.css grid.css */
-body.off-canvas { padding: 0; margin: 0; overflow: hidden}
+body.off-canvas { padding: 0; margin: 0;}
 
 .container { width: 100%; }
 
diff --git a/app/assets/stylesheets/darkswarm/sidepanel.css.sass b/app/assets/stylesheets/darkswarm/sidepanel.css.sass
new file mode 100644
index 0000000000..65b323a2e9
--- /dev/null
+++ b/app/assets/stylesheets/darkswarm/sidepanel.css.sass
@@ -0,0 +1,13 @@
+@import "foundation/variables"
+@import "foundation/components/global"
+@import "foundation/components/buttons"
+@import "foundation/components/panels"
+
+
+#sidebar
+  margin-top: 1.875em
+  .login-panel
+    $bg: #222
+    $padding: emCalc(20)
+    $adjust: true
+    @include panel($bg, $padding, $adjust)
diff --git a/app/views/shared/_login_panel.html.haml b/app/views/shared/_login_panel.html.haml
index 8859632fc4..333c872467 100644
--- a/app/views/shared/_login_panel.html.haml
+++ b/app/views/shared/_login_panel.html.haml
@@ -1,6 +1,7 @@
 .login-panel
   %a{href: "#"} Close
-  #login-content
+
+  #login-content{"ng-show" => "active_sidebar == '/login'"}
     = render "home/login"
-  #sign-up-content
+  #sign-up-content{"ng-show" => "active_sidebar == '/signup'"}
     = render "home/signup"