diff --git a/app/views/layouts/_navigation.html.erb b/app/views/layouts/_navigation.html.erb
index 8a2a633..dd893ac 100644
--- a/app/views/layouts/_navigation.html.erb
+++ b/app/views/layouts/_navigation.html.erb
@@ -1,6 +1,7 @@
 <%= link_to 'Pretro', root_path, class: 'item' %>
 <%= link_to 'Home', root_path, class: 'item' %>
 <%= link_to 'Teams', teams_path, class: 'item' %>
+<% if user_signed_in? %>
 <div class="right menu">
   <div class="ui simple dropdown item" id="dropdown">
     Account <i class="dropdown icon"></i>
@@ -11,4 +12,5 @@
       <%= link_to 'Log out', root_path, class: 'item' %>
     </div>
   </div>
-</div>
\ No newline at end of file
+</div>
+<% end %>
\ No newline at end of file
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
deleted file mode 100644
index 351fc21..0000000
--- a/app/views/welcome/index.html.erb
+++ /dev/null
@@ -1,36 +0,0 @@
-<h2 class="ui centered header">Welcome to Pretro!</h2>
-
-<div class="ui container">
-  <div class="ui placeholder segment">
-    <div class="ui two column very relaxed stackable grid">
-      <div class="column">
-        <div class="ui form">
-          <div class="field">
-            <label>Username</label>
-            <div class="ui left icon input">
-              <input type="text" placeholder="Username">
-              <i class="user icon"></i>
-            </div>
-          </div>
-          <div class="field">
-            <label>Password</label>
-            <div class="ui left icon input">
-              <input type="password">
-              <i class="lock icon"></i>
-            </div>
-          </div>
-          <div class="ui blue submit button">Login</div>
-        </div>
-      </div>
-      <div class="middle aligned column">
-        <div class="ui big button">
-          <i class="signup icon"></i>
-          Sign Up
-        </div>
-      </div>
-    </div>
-    <div class="ui vertical divider">
-      Or
-    </div>
-  </div>
-</div>
\ No newline at end of file
diff --git a/app/views/welcome/index.html.haml b/app/views/welcome/index.html.haml
new file mode 100644
index 0000000..6de2159
--- /dev/null
+++ b/app/views/welcome/index.html.haml
@@ -0,0 +1,23 @@
+%h2.ui.centered.header Welcome to Pretro!
+.ui.container
+  .ui.placeholder.segment
+    .ui.two.column.very.relaxed.stackable.grid
+      .column
+        = form_with scope: :session, class: "ui form", url: login_path do |f|
+          .field
+            =f.label :username
+            .ui.left.icon.input
+              =f.text_field :username, placeholder: "Username"
+              %i.user.icon
+          .field
+            =f.label :password
+            .ui.left.icon.input
+              =f.text_field :password, placeholder: "Password"
+              %i.lock.icon
+          = f.button "Log in", class: "ui blue submit button"
+      .middle.aligned.column
+        .ui.big.button
+          %i.signup.icon
+          Sign Up
+    .ui.vertical.divider
+      Or
diff --git a/config/routes.rb b/config/routes.rb
index d9492fd..77dbea4 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -3,4 +3,5 @@
   resources :users, only: [:show, :index]
   root 'welcome#index'
   get 'teams', to: 'teams#index'
+  post 'login', to: 'sessions#create'
 end