diff --git a/phoenix/notejam/web/controllers/notes_controller.ex b/phoenix/notejam/web/controllers/notes_controller.ex
index af0e2055c..fef44f727 100644
--- a/phoenix/notejam/web/controllers/notes_controller.ex
+++ b/phoenix/notejam/web/controllers/notes_controller.ex
@@ -2,6 +2,11 @@ defmodule Notejam.NotesController do
   use Notejam.Web, :controller
 
   def index(conn, _params) do
-    render conn, "index.html", title: "All notes (8)"
+    logged_in = get_session(conn, :logged_in)
+    if logged_in do
+      render conn, "index.html", title: "All notes (8)", logged_in: logged_in
+    else
+      redirect conn, to: "/signup"
+    end
   end
 end
\ No newline at end of file
diff --git a/phoenix/notejam/web/controllers/users_controller.ex b/phoenix/notejam/web/controllers/users_controller.ex
index ffd5e58ad..128330ee4 100644
--- a/phoenix/notejam/web/controllers/users_controller.ex
+++ b/phoenix/notejam/web/controllers/users_controller.ex
@@ -2,6 +2,7 @@ defmodule Notejam.UsersController do
   use Notejam.Web, :controller
 
   def new(conn, _params) do
-    render conn, "new.html", title: "Sign Up"
+    logged_in = get_session(conn, :logged_in)
+    render conn, "new.html", title: "Sign Up", logged_in: logged_in
   end
 end
\ No newline at end of file
diff --git a/phoenix/notejam/web/templates/layout/app.html.eex b/phoenix/notejam/web/templates/layout/app.html.eex
index b12791f40..99a396658 100644
--- a/phoenix/notejam/web/templates/layout/app.html.eex
+++ b/phoenix/notejam/web/templates/layout/app.html.eex
@@ -32,12 +32,17 @@
   <div class="container">
     <div class="sixteen columns">
       <div class="sign-in-out-block">
+        <%= if @logged_in do %>
         komarserjio@gmail.com:&nbsp; <a href="#">Account settings</a>&nbsp;&nbsp;&nbsp;<a href="#">Sign out</a>
+        <% else %>
+        <a href="<%= users_path(@conn, :new) %>">Sign up</a>&nbsp;&nbsp;&nbsp;<a href="#">Sign in</a>
+        <% end %>
       </div>
     </div>
     <div class="sixteen columns">
       <h1 class="bold-header"><a href="<%= notes_path(@conn, :index) %>" class="header">note<span class="jam">jam: </span></a> <span><%= @title %></span></h1>
     </div>
+    <%= if @logged_in do %>
     <div class="three columns">
       <h4 id="logo">My pads</h4>
       <nav>
@@ -52,7 +57,7 @@
       <a href="#">New pad</a>
       </nav>
     </div>
-
+    <% end %>
     <%= @inner %>
 
     <hr class="footer" />