diff --git a/web/static/assets/images/checked.svg b/web/static/assets/images/checked.svg
index 3169225..fe60acc 100644
--- a/web/static/assets/images/checked.svg
+++ b/web/static/assets/images/checked.svg
@@ -1,13 +1,12 @@
 <svg viewBox="0 0 50 50" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>Group 10</title>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Desktop-HD-Copy-2" transform="translate(-480.000000, -681.000000)">
-            <g id="Group-10" transform="translate(480.000000, 681.000000)">
-                <g id="Group-6" fill="#EBF3F3">
-                    <circle id="Oval" cx="25" cy="25" r="25"></circle>
-                </g>
-                <polyline id="Path-2" stroke="#47B9B4" stroke-width="5.1" stroke-linecap="round" stroke-linejoin="round" points="15 23.5239125 22.2485778 34 36 16"></polyline>
-            </g>
-        </g>
-    </g>
+  <g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+      <g transform="translate(-480.000000, -681.000000)">
+          <g transform="translate(480.000000, 681.000000)">
+              <g fill="#47B9B4">
+                  <circle cx="25" cy="25" r="25"></circle>
+              </g>
+              <polyline stroke="#ffffff" stroke-width="5.1" stroke-linecap="round" stroke-linejoin="round" points="15 23.5239125 22.2485778 34 36 16"></polyline>
+          </g>
+      </g>
+  </g>
 </svg>
diff --git a/web/static/assets/images/dropdown-bg.png b/web/static/assets/images/dropdown-bg.png
new file mode 100644
index 0000000..ff476b7
Binary files /dev/null and b/web/static/assets/images/dropdown-bg.png differ
diff --git a/web/static/css/app.css b/web/static/css/app.css
index f2eec27..69a17f4 100644
--- a/web/static/css/app.css
+++ b/web/static/css/app.css
@@ -144,16 +144,16 @@ a {
 .hero {
   display: flex;
   align-items: center;
-  justify-content: center;
   flex-direction: column;
   background-image: url("/images/hero.jpg");
   background-size: cover;
   background-position: center;
-  min-height: 536px;
+  padding-top: 42px;
+  padding-bottom: 42px;
 }
 
 .hero__logo {
-  width: 200px;
+  width: 233px;
   -webkit-filter: drop-shadow(-2px -2px 5px #656c70);
   filter: drop-shadow(-2px -2px 5px #656c70);
 }
@@ -168,6 +168,7 @@ a {
 .bottom {
   min-height: 100%;
   text-align: center;
+  position: relative;
 }
 
 .bottom__offset {
@@ -177,30 +178,22 @@ a {
 
 .bottom__title {
   font-size: 35px;
+  color: #31b0e2;
+  line-height: 1.1em;
 }
 
-.bottom__back-link {
-  font-size: 16px;
-  font-weight: 700;
-  color: #9b9b9b;
-  padding: 10px;
-}
-
-.bottom__back-link a {
-  color: #9b9b9b;
-  text-decoration: none;
-}
-
-.bottom__back-link a:hover, a:focus {
-  text-decoration: underline;
+.bottom__title--white {
+  color: white;
 }
 
-.bottom__back-link:before {
-   content: "< ";
+.steps p {
+  font-size: 20px;
+  color: #31b0e2;
+  margin-top: 0;
 }
 
 .steps__description {
-  color: black;
+  color: #444343;
   margin-top: 0;
   font-size: 25px;
 }
@@ -212,6 +205,8 @@ a {
 .steps__image--checked {
   width: 50px;
   height: 50px;
+  border-radius: 50%;
+  border: 1px solid black;
 }
 
 .steps__item {
@@ -235,26 +230,25 @@ a {
   display: flex;
   align-items: center;
   justify-content: center;
-  color: black;
+  color: #444343;
   font-size: 22px;
   width: 50px;
   height: 50px;
   border-radius: 50%;
-  background-color: white;
-  border: 1px solid black;
+  background-color: #ebf3f3;
+  border: solid 1px #4c4f4f;
 }
 
 .try {
-  min-height: 200px;
+  color: white;
   display: flex;
   flex-direction: column;
   align-items: center;
-  justify-content: center;
-  background-color: #31B0E2;
-  padding: 1em;
-  -webkit-clip-path: polygon(0px 100%, 100% 100%, 100% 0px, 0px 60px);
-  clip-path: polygon(0px 100%, 100% 100%, 100% 0px, 0px 60px);
-  margin: -1.4em;
+  justify-content: flex-end;
+  padding-bottom: 2.8em;
+  padding-top: 4em;
+  border-bottom: 1px solid white;
+  /*margin: -1.4em;*/
 }
 
 .try__title {
@@ -263,7 +257,7 @@ a {
 }
 
 .steps__right a {
-  color: black;
+  color: #444343;
   text-decoration: none;
 }
 
@@ -282,30 +276,41 @@ a {
   display: inline-block;
 }
 
-footer {
-  border-top: 1px solid white;
-  text-align: center;
-  padding: 0.3em;
-  background-color: #31B0E2;
-  font-size: 18px;
-  font-weight: 600;
-  margin: 1.2em -1.2em -1.2em -1.2em;
-}
-
 .team-management {
-  padding: 0px 150px;
   color: #31b0e2;
+  font-size: 20px;
 }
 
-.team-management h2 {
-  padding: 40px 0 20px 0;
+.preferences__input {
+  display: block;
+  margin: 0.5em auto;
+  font-weight: 700;
+  width: 74px;
+  height: 55px;
+  border: 0;
+  font-size: 25px;
+  color: #31b0e2;
+  border-radius: 3px;
+  text-align: center;
+  box-shadow: 0 0 3px 0 rgba(0, 0, 0, 0.15);
 }
 
-.preferences__input {
-  width: 40px;
+.preferences__submit {
   text-align: center;
 }
 
+.preferences__submit button {
+  background: white;
+  border: 0;
+  box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.24), 0 0 1px 0 rgba(0, 0, 0, 0.12);
+  border-radius: 5px;
+  padding: 0.3em 0.6em;
+}
+
+.preferences__submit button:hover {
+  cursor: pointer;
+}
+
 .articles__action a {
   color: #9f9f9f;
 }
@@ -357,53 +362,155 @@ footer {
   border-radius: 3px;
 }
 
-.action__button {
-  background-color: white;
-  margin-top: 10px;
-  border-radius: 3px;
-  padding: 4px 10px;
+.action a {
+  text-decoration: none;
+  font-size: 16px;
+  font-weight: 400;
+  color: #343333;
 }
 
-.action__button a {
-  color: black;
+.action__button--white {
+  border-radius: 3px;
+  background-color: white;
+  box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.24), 0 0 1px 0 rgba(0, 0, 0, 0.12);
+  padding: 0.8em;
+  color: #444343;
   text-decoration: none;
 }
 
+.setup {
+  margin-top: 1em;
+}
+
 .setup__header {
   text-align: center;
   line-height: 40px;
   background-color: #31b0e2;
   color: white;
+  padding: 2.8em;
+  margin: 0 -1.3em;
+}
+
+.setup__title {
+  font-size: 20px;
+  line-height: 1.3em;
+  margin: 0;
 }
 
 .setup__body {
-  color: black;
-  padding: 0px 150px;
-  font-size: 25px;
+  color: #444343;
+  font-size: 20px;
+}
+
+.setup__body {
+  text-align: center;
 }
 
 .setup__body p {
   padding: 20px 40px;
 }
 
-.setup__body-centered {
-  text-align: center;
+.setup__note code {
+  padding: 4px;
+  background-color: #f4f3f3;
+  font-size: 75%;
+}
+
+.setup__edit {
+  margin: 0 auto;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
 }
 
-.setup__link {
+.setup__link a {
+  display: inline-block;
+  color: #444343;
+  text-decoration: none;
   background-color: white;
   margin-top: 10px;
   border-radius: 3px;
-  padding: 4px 10px;
-  border: 2px solid #F6F6F6;
-  box-shadow: 2px 2px 5px #888888;
-  margin: 20px 120px;
+  padding: 10px 20px;
+  box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.24), 0 0 1px 0 rgba(0, 0, 0, 0.12);
 }
 
-.setup__link a {
-  color: black;
+.back {
+  margin-left: 44px;
+  margin-top: 22px;
+}
+
+.back a {
+  color: #9b9b9b;
+  font-weight: 700;
+  position: relative;
   text-decoration: none;
 }
+
+.back a:hover,
+.back a:focus {
+  text-decoration: underline;
+}
+
+.back a::before {
+  content: '';
+  position: absolute;
+  left: -16px;
+  top: 3px;
+  transform: rotate(45deg);
+  height: 8px;
+  width: 8px;
+  border-bottom: 2px solid #9b9b9b;
+  border-left: 2px solid #9b9b9b;
+}
+
+.select-item {
+  height: 45px;
+  overflow: hidden;
+  width: 290px;
+  background: url("/images/dropdown-bg.png") no-repeat right;
+  border-radius: 6px;
+  box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.24), 0 0 1px 0 rgba(0, 0, 0, 0.12);
+  margin-bottom: 0.5em;
+}
+
+.select-item select {
+  background: transparent;
+  border: 0;
+  font-size: 14px;
+  height: 50px;
+  padding: 5px; /* If you add too much padding here, the options won't show in IE */
+  width: 300px;
+}
+
+
+
+.emoji {
+  font-size: 30px;
+}
+
+footer {
+  background-color: #31B0E2;
+  display: flex;
+  flex-direction: column;
+  justify-content: flex-end;
+  text-align: center;
+  background-color: #31B0E2;
+  font-size: 18px;
+  font-weight: 600;
+  min-height: 120px;
+  margin: 1.2em -1.2em -1.2em -1.2em;
+  -webkit-clip-path: polygon(0px 100%, 100% 100%, 100% 0px, 0px 60px);
+  clip-path: polygon(0px 100%, 100% 100%, 100% 0px, 0px 60px);
+}
+
+footer p {
+  color: white;
+}
+
+footer.no-border {
+  border: none;
+}
+
 /* ==========================================================================
    Media Queries
    ========================================================================== */
@@ -418,10 +525,12 @@ footer {
     text-align: left;
   }
   .steps__item {
-    display: table;
+    display: flex;
+    flex-direction: row;
+    width: 100%;
     padding-bottom: 100px;
     position: relative;
-    color: black;
+    color: #444343;
   }
   .steps__item::after {
     content: '';
@@ -430,7 +539,7 @@ footer {
     bottom: 3px;
     left: 55px;
     width: 3px;
-    background-color: black;
+    background-color: #444343;
   }
   .steps__item:last-child:after {
     background-color: transparent;
@@ -444,22 +553,29 @@ footer {
     vertical-align: top;
   }
   .steps__left {
-    width: 200px;
+    min-width: 160px;
   }
-  .steps__right {
-    width: 412px;
+  .steps--setup .steps__left {
+    min-width: 100px;
   }
   .steps--setup .steps__item::after {
     visibility: hidden;
   }
-  .steps--setup .steps__left {
-    justify-content: flex-end;
+  .setup__title {
+    font-size: 40px;
   }
-  .steps__number {
-    margin-right: 50px;
+  .setup__edit {
+    width: 60%;
   }
-  .steps__image--checked {
-    margin-right: 50px;
+  .preferences__input {
+    display: inline-block;
+    margin: 0 0.5em;
+  }
+  .team-management {
+    font-size: 25px;
+  }
+  .emoji {
+    font-size: 50px;
   }
 }
 
@@ -467,6 +583,10 @@ footer {
   .header {
     padding: 0;
   }
+  .hero {
+    min-height: 494px;
+    padding-bottom: 0;
+  }
   .container {
     max-width: 940px;
     margin: 0 auto;
@@ -482,17 +602,40 @@ footer {
   }
   .bottom__title {
     font-weight: 700;
-    font-size: 36px;
+    font-size: 40px;
     margin: 0;
-    padding: 70px 150px 20px 150px;
-    color: #31b0e2;
+    padding: 85px 160px 40px 160px;
   }
   .steps {
-    padding: 0 150px 0 150px;
+    padding: 0 160px 0 160px;
+  }
+  .steps__number {
+    margin-right: 50px;
+  }
+  .steps__image--checked {
+    margin-right: 50px;
+  }
+  .steps--setup .steps__left {
+    justify-content: flex-start;
   }
   .try {
     margin: inherit;
   }
+  .setup__header {
+    margin: 0;
+  }
+  .setup__body {
+    padding: 100px;
+    margin: 0 auto;
+    font-size: 25px;
+  }
+  .setup__edit {
+    margin-top: 100px;
+    margin-bottom: 34px;
+  }
+  .team-management {
+    padding: 0 160px 0 160px;
+  }
   footer {
     margin: 0;
   }
@@ -518,3 +661,9 @@ footer {
 .disabled {
   opacity: 0.4;
 }
+
+.visually-hidden {
+  visibility: hidden;
+  font-size: 0;
+  height: 0;
+}
diff --git a/web/templates/article/index.html.eex b/web/templates/article/index.html.eex
index fcef8c6..72e1451 100644
--- a/web/templates/article/index.html.eex
+++ b/web/templates/article/index.html.eex
@@ -5,33 +5,35 @@
 
 <div class="bottom">
   <div class="bottom__offset container">
-    <div class="bottom__back-link">
+    <div class="back">
       <%= link "back to \"How Post Works\"", to: page_path(@conn, :index) %>
     </div>
-
+    <h2 class="bottom__title">Manage your preferences</h2>
     <div class="team-management">
-      <h2 class="bottom__title">Manage your preferences</h2>
       <div class="preferences">
         <%= form_for team_changeset(@current_team), preference_path(@conn, :update), fn form -> %>
         <h3>Notify me when:</h3>
         <p>
-          There is an increase of at least <%= text_input form, :min_view_count_increase, class: "preferences__input" %> views,
+          There is an increase of at least <%= text_input form, :min_view_count_increase, class: "preferences__input", autofocus: "true" %> views,
         </p>
         <p>
           and there is pageview increase of <%= text_input form, :view_count_threshold, class: "preferences__input" %>% or more.
         </p>
-          <%= submit "Submit" %>
+          <div class="preferences__submit">
+            <%= submit "Submit" %>
+          </div>
         <% end %>
       </div>
+    </div>
 
-      <h2 class="bottom__title">Your registered articles</h2>
+    <h2 class="bottom__title">Your registered articles</h2>
+    <div class="team-management">
       <div class="articles">
         <table class="table">
           <tbody>
             <%= for article <- @articles do %>
               <tr class="table__row">
                 <td class="table__cell"><%= article.url %></td>
-
                 <td class="table__cell articles__action">
                   <%= link "Edit URL", to: article_path(@conn, :edit, article), class: "btn btn-default btn-xs" %>
                   <%= link "Delete", to: article_path(@conn, :delete, article), method: :delete, data: [confirm: "Are you sure?"] %>
diff --git a/web/templates/page/action.html.eex b/web/templates/page/action.html.eex
index 21bf204..573b9fb 100644
--- a/web/templates/page/action.html.eex
+++ b/web/templates/page/action.html.eex
@@ -1,8 +1,8 @@
-<div class="action__button">
+<div class="action">
   <%= case team_state(@current_team) do %>
     <% :complete -> %>
       <%= link to: article_url(@conn, :index) do %>
-        <div>
+        <div class="action__button--white">
           View your <strong>Team Settings</strong>
         </div>
       <% end %>
@@ -17,7 +17,7 @@
       <% end %>
     <% _ -> %>
       <%= link to: setup_path(@conn, :update) do %>
-        <div>
+        <div class="action__button--white">
           View your <strong>Team Settings</strong>
         </div>
     <% end %>
diff --git a/web/templates/page/index.html.eex b/web/templates/page/index.html.eex
index 13aeb07..42eb207 100644
--- a/web/templates/page/index.html.eex
+++ b/web/templates/page/index.html.eex
@@ -43,13 +43,13 @@
         </div>
       </li>
     </ul>
-    <div class="try">
-      <%= if is_nil(@current_team) do %>
-        <h3 class="try__title">Try POST now:</h3>
-      <% end %>
-      <%= render "action.html", current_team: @current_team, conn: @conn %>
-    </div>
     <footer>
+      <div class="try">
+        <%= if is_nil(@current_team) do %>
+          <h3 class="try__title">Try POST now:</h3>
+        <% end %>
+        <%= render "action.html", current_team: @current_team, conn: @conn %>
+      </div>
       <p>Have feedback or questions? Contact us</p>
     </footer>
   </div>
diff --git a/web/templates/setup/confirm.html.eex b/web/templates/setup/confirm.html.eex
index d1772fd..d3896e0 100644
--- a/web/templates/setup/confirm.html.eex
+++ b/web/templates/setup/confirm.html.eex
@@ -7,26 +7,26 @@
 
 <div class="bottom">
   <div class="bottom__offset container">
-    <div class="bottom__back-link">
+    <div class="back">
       <%= link "back to \"How Post Works\"", to: page_path(@conn, :index) %>
     </div>
     <div class="setup">
       <div class="setup__header">
-        <h2 class="bottom__title">
-          🙌</br>
+        <h2 class="setup__title">
+          <span class="emoji">🙌</span></br>
           High Five!</br>
           POST Bot is now set up!
         </h2>
       </div>
       <div class="setup__body">
-        <p class="setup__body--centered">
+        <p class="setup__note">
           You can now add your Articles URL
-          directly in Slack by writing <code>“/add [URL]”</code> in a direct message to the Bot
+          directly in Slack by writing <code>/add [URL]</code> in a direct message to the Bot
         </p>
-        <p class="setup__body-centered">
-          👉 You can also edit your team preferences and articles:
-        </p>
-        <div class="setup__link setup__body-centered">
+        <div class="setup__edit">
+          <span class="emoji">👉</span><span>You can also edit your team preferences and articles:</span>
+        </div>
+        <div class="setup__link">
           <%= link "Manage team preferences", to: article_path(@conn, :index) %>
         </div>
       </div>
diff --git a/web/templates/setup/index.html.eex b/web/templates/setup/index.html.eex
index f9514a5..b83a234 100644
--- a/web/templates/setup/index.html.eex
+++ b/web/templates/setup/index.html.eex
@@ -6,8 +6,8 @@
 
 <div class="bottom">
   <div class="bottom__offset container">
-    <div>
-      <%= link "< back to \"How Post Works\"", to: page_path(@conn, :index) %>
+    <div class="back">
+      <%= link "back to \"How Post Works\"", to: page_path(@conn, :index) %>
     </div>
     <h2 class="bottom__title">Welcome to POST Bot:</h2>
     <ul class="steps steps--setup">
@@ -44,6 +44,7 @@
         </div>
         <div class="steps__right">
           <h3 class="steps__title"><strong>Step 2 &ndash;</strong> Authenticate Google Analytics</h3>
+          <p>You'll need a Google account with access to view your Google Analytics data.</p>
           <%= if @current_team && !@current_team.google_token do %>
             <%= link to: auth_path(@conn, :request, :google) do %>
               <div class="google">
@@ -54,7 +55,6 @@
                 Link your Google account
               </div>
             <% end %>
-            <p>You'll need a Google account with access to view your Google Analytics data.</p>
           <% end %>
         </div>
       </li>
@@ -68,37 +68,21 @@
         </div>
         <div class="steps__right">
           <h3 class="steps__title"><strong>Step 3 &ndash;</strong> Select your Google Analytics web property</h3>
+          <p>Select which web property your articles belong to.</p>
           <%= if @current_team && !@current_team.google_property_id do %>
             <%= form_for team_changeset(@current_team), setup_path(@conn, :update), fn form -> %>
-              <%= select form, :google_property_id, web_properties(@current_team), class: "form-control", prompt: "Select Google Analytics Property" %>
-              <%= submit "Submit" %>
+              <div class="select-item">
+                <%= select form, :google_property_id, web_properties(@current_team), class: "form-control", prompt: "Select Google Analytics Property", onchange: "this.form.submit()" %>
+              </div>
+              <div class="visually-hidden">
+                <%= submit "Submit" %>
+              <div>
             <% end %>
-            <p>Select which web property your articles belong to.</p>
           <% end %>
         </div>
       </li>
     </ul>
-    <div class="try">
-      <h3 class="try__title">Try POST now:</h3>
-      <%= if @current_team do %>
-        <img
-          class="disabled"
-          alt="Sign in with Slack "
-          height="40"
-          width="172"
-          src="https://platform.slack-edge.com/img/sign_in_with_slack.png"
-          srcset="https://platform.slack-edge.com/img/sign_in_with_slack.png 1x, https://platform.slack-edge.com/img/sign_in_with_slack@2x.png 2x"/>
-      <% else %>
-        <%= link to: auth_path(@conn, :request, :slack) do %>
-          <img
-            alt="Sign in with Slack"
-            height="40"
-            width="172"
-            src="https://platform.slack-edge.com/img/sign_in_with_slack.png"
-            srcset="https://platform.slack-edge.com/img/sign_in_with_slack.png 1x, https://platform.slack-edge.com/img/sign_in_with_slack@2x.png 2x"/>
-        <% end %>
-      <% end %>
-    </div>
+
     <footer>
       <p>Have feedback or questions? Contact us</p>
     </footer>