diff --git a/app/assets/stylesheets/board/create.scss b/app/assets/stylesheets/board/create.scss
index 6a64f45f..21ee0ccd 100644
--- a/app/assets/stylesheets/board/create.scss
+++ b/app/assets/stylesheets/board/create.scss
@@ -1,52 +1,34 @@
-.create-new-board--container {
+.create-new-board__container {
   max-width: 600px;
   margin-left: auto;
   margin-right: auto;
+  padding-bottom: 30px;
+  font-size: 15px;
 }
 
-.create-new-board--message {
-  margin: 0px auto 30px auto;
-  margin-bottom: 30px;
-  font-size: 15px;
+.create-new-board__message {
+  margin: 0px auto;
 }
 
-.create-new-board--list {
+.create-new-board__list {
   list-style: none;
   padding-left: 10px;
-  padding-bottom: 10px;
   text-align: left;
-  li {
+  &__item {
     border-left-style: solid;
     border-left-color: $lightGrey;
     padding-left: 10px;
     margin-bottom: 14px;
-  }
-}
-
-.create-new-board--form {
-  input.btn.primary {
-    background: none;
-    font-size: 16px;
-    border-style: solid;
-    padding: 18px;
-    border-radius: 6px;
-    text-shadow: none;
-    &:hover {
-      background-color: $hb-purple;
-      color: white;
+    &--error {
+      border-left-color: $red;
     }
   }
 }
 
-.create-new-board--labels {
+.create-new-board__labels {
   @include display(flex);
   @include align-items(center);
   @include justify-content(center);
-  .labels-create-message {
-    font-size: 16px;
-    margin-bottom: 20px;
-  }
-  .labels-create-columns {
-    font-size: 14px;
-  }
+  padding-bottom: 10px;
+  font-size: 16px;
 }
diff --git a/app/views/board/create_board.html.erb b/app/views/board/create_board.html.erb
index 97443a4a..c0752575 100644
--- a/app/views/board/create_board.html.erb
+++ b/app/views/board/create_board.html.erb
@@ -1,66 +1,82 @@
 <div class="instructions drop-shadow create-new-board">
-  <div class="create-new-board--container">
-  <% if @parameters['create_failed']%>
-    <h2> Oops! </h2>
-    <div class="create-new-board--message">
-      <h3> HuBoard is unable to create a board for you! </h3>
-      <ul class="create-new-board--list">
-        <li>You will need write permissions on <%= @parameters['user'] %>/<%= @parameters['repo'] %></li>
-        <li>If <%= @parameters['user'] %> is a GitHub Organization: <a href=https://help.github.com/articles/disabling-third-party-application-restrictions-for-your-organization/" target="blank">ensure no access restrictions are present</a></li>
-        <li><a href="mailto:support@huboard.com">Talk to us!</a></li>
-      </ul>
-      <%= form_tag 'create', class: 'create-new-board--form' do %>
-        <input class="btn primary" type="submit" value="Try again!" data-analytics-path='/board/creating'/>
-        <a href="/dashboard">
-          <input class="btn primary" type="button" value="Go home">
-        </a>
+  <div class="create-new-board__container">
+    <% if @parameters['create_failed']%>
+      <h2> Oops! </h2>
+      <div class="create-new-board__message">
+        <h3> HuBoard is unable to create a board for you! </h3>
+        <ul class="create-new-board__list">
+          <li class="create-new-board__list__item create-new-board__list__item--error">
+            <p>
+            You will need write permissions to <b><%= @parameters['user'] %>/<%= @parameters['repo'] %></b>
+            </p>
+            <% if  @repo['owner'] && @repo['owner']['type'] == "Organization" %>
+            <p>
+            <b><%= @repo['owner']['login'] %></b> is a GitHub Organization: <a href="https://help.github.com/articles/disabling-third-party-application-restrictions-for-your-organization/" target="blank">Please ensure no access restrictions are present</a>
+            </p>
+            <% end %>
+            <p>
+              <a href="mailto:support@huboard.com">Talk to us!</a>
+            </p>
+          </li>
+        </ul>
+        <%= form_tag 'create', class: 'create-new-board__form' do %>
+          <input class="btn btn-large btn-primary" type="submit" value="Try again" data-analytics-path='/board/creating/retry'/>
+          <a href="/dashboard" class="btn btn-large primary" data-analytics-path='/board/creating/abandon'>
+            Go Home
+          </a>
+        <% end %>
       </div>
-      <% end %>
-    </div>
-  <% elsif @repo && @repo['permissions'] && @repo['permissions']['push'] %>
-    <h2> <%= @parameters['user'] %>/<%= @parameters['repo'] %> is not yet configured for HuBoard</h2>
-  <div class="create-new-board--message">
-    <h4> We can automatically get you started with a default label configuration: </h4>
-    <br>
-    <div class="create-new-board--labels">
-      <div class="labels-create-message">
-        <p> Allow HuBoard to create the following labels? </p>
+    <% elsif @repo && @repo['permissions'] && @repo['permissions']['push'] %>
+      <h2> <%= @parameters['user'] %>/<%= @parameters['repo'] %> is not yet configured for HuBoard</h2>
+      <div class="create-new-board__message">
+        <h3> We can automatically get you started with a default label configuration: </h3>
+        <br/>
+        <div class="create-new-board__labels">
+          <div>
+            <p> Allow HuBoard to create the following labels? </p>
+          </div>
+          <div>
+            <ul class="create-new-board__list">
+              <li class="create-new-board__list__item"> 0 - Backlog </li>
+              <li class="create-new-board__list__item"> 1 - Ready </li>
+              <li class="create-new-board__list__item"> 2 - Working </li>
+              <li class="create-new-board__list__item"> 3 - Review </li>
+              <li class="create-new-board__list__item"> 4 - Done </li>
+            </ul>
+          </div>
+        </div>
+        <%= form_tag 'create', class: 'create-new-board__form' do %>
+          <input class="btn btn-large btn-primary" type="submit" value="Yes, Do it for me!" data-analytics-path='/board/creating'/>
+          <a href="<%= @repo['html_url'] %>/issues" target="_blank" data-analytics-path='/board/creating/manual' class='btn btn-large' >
+            Create columns manually
+          </a>
+        <% end %>
       </div>
-      <div class="labels-create-columns">
-        <ul class="create-new-board--list">
-          <li> 0 - Backlog </li>
-          <li> 1 - Ready </li>
-          <li> 2 - Working </li>
-          <li> 3 - Review </li>
-          <li> 4 - Done </li>
+    <% else %>
+      <h2> <%= @parameters['user'] %>/<%= @parameters['repo'] %> is not yet configured for HuBoard</h2>
+      <div class="create-new-board__message">
+        <ul class="create-new-board__list">
+          <li class="create-new-board__list__item create-new-board__list__item--error">
+            <p>
+            You will need write permissions to <b><%= @parameters['user'] %>/<%= @parameters['repo'] %></b>
+            </p>
+            <% if  @repo['owner'] && @repo['owner']['type'] == "Organization" %>
+            <p>
+            <b><%= @repo['owner']['login'] %></b> is a GitHub Organization: <a href="https://help.github.com/articles/disabling-third-party-application-restrictions-for-your-organization/" target="blank">Please ensure no access restrictions are present</a>
+            </p>
+            <% end %>
+            <p>
+              <a href="mailto:support@huboard.com">Talk to us!</a>
+            </p>
+          </li>
         </ul>
-      </div>
-    </div>
-    <%= form_tag 'create', class: 'create-new-board--form' do %>
-      <input class="btn primary" type="submit" value="Yes, Do it for me!" data-analytics-path='/board/creating'/>
-      <a href="<%= @repo['html_url'] %>/issues" target="_blank" >
-        <input class="btn primary" type="button" value="Create columns manually">
-      </a>
-    </div>
-    <% end %>
-  <% else %>
-    <h2> <%= @parameters['user'] %>/<%= @parameters['repo'] %> is not yet configured for HuBoard</h2>
-    <div class="create-new-board--message">
-      <ul class="create-new-board--list">
-        <li>You will need write permission on <%= @parameters['user'] %>/<%= @parameters['repo'] %></li>
-        <li>If <%= @parameters['user'] %> is a GitHub Organization: <a href=https://help.github.com/articles/disabling-third-party-application-restrictions-for-your-organization/" target="blank">ensure no access restrictions are present</a></li>
-        <li><a href="mailto:support@huboard.com">Talk to us!</a></li>
-      </ul>
-      <%= form_tag 'create_board', class: 'create-new-board--form' do %>
-        <a href="/<%= @parameters['user'] %>/<%= @parameters['repo'] %>">
-          <input class="btn primary" type="button" value="Try again">
+        <a href="/<%= @parameters['user'] %>/<%= @parameters['repo'] %>/board/create" class="btn btn-large btn-primary" data-analytics-path='/board/creating/retry'>
+          Try again
         </a>
-        <a href="/dashboard">
-          <input class="btn primary" type="button" value="Go home">
+        <a href="/dashboard" class="btn btn-large primary" data-analytics-path='/board/creating/abandon'>
+          Go Home
         </a>
       </div>
-      <% end %>
-    </div>
-  <% end %>
+    <% end %>
   </div>
 </div>