diff --git a/app/controllers/answers.rb b/app/controllers/answers.rb
index d880504..0737fa1 100644
--- a/app/controllers/answers.rb
+++ b/app/controllers/answers.rb
@@ -1,6 +1,6 @@
 post '/questions/:question_id/answers' do
   @question = Question.find_by(id: params[:question_id])
-  @answer = Answer.new(description: params[:description])
+  @answer = Answer.new(description: params[:description], user_id: current_user.id)
   @answers = @question.answers
   @comments = @answer.comments
   if @answer.save
diff --git a/app/views/_vote_button.erb b/app/views/_question_vote_button.erb
similarity index 100%
rename from app/views/_vote_button.erb
rename to app/views/_question_vote_button.erb
diff --git a/app/views/answers/_individual_answer.erb b/app/views/answers/_individual_answer.erb
index 1b4ce31..f608948 100644
--- a/app/views/answers/_individual_answer.erb
+++ b/app/views/answers/_individual_answer.erb
@@ -1,9 +1,19 @@
-<li>
-  <%=answer.description%></li>
+<div class= "add-answer-comment" id = "<%=answer.id%>">
+<br><li><b class="blue"><%=answer.description%></b></li>
 
+<% if logged_in? %>
 <a class= 'add-answer-comment-link' href= "#" >Add a comment to this answer</a><br>
+<% end %>
+
+ <ul class ="answer-comment-list">
+   <% answer.comments.each do |comment| %>
+     <%= erb :'/comments/_individual_comment', locals: {answer: answer, question: @question, comment: comment} %>
+   <% end %>
+ </ul>
 
   <form action = "/questions/<%=question.id%>/answers/<%=answer.id%>/answer_comment" method = "POST" class= "answer-comment-form hidden">
     <input id= "answer-comment-description" type ="text" name= "description" placeholder= "Your Comment">
     <input type ="submit" value= "Submit Comment">
   </form>
+</div>
+
diff --git a/app/views/index.erb b/app/views/index.erb
deleted file mode 100644
index e69de29..0000000
diff --git a/app/views/layout.erb b/app/views/layout.erb
index d3d5a67..dce5a79 100644
--- a/app/views/layout.erb
+++ b/app/views/layout.erb
@@ -32,7 +32,9 @@
 
   <div id="logo-header">
     <a href="/"><img src="../traveloverflow.png" width="507px" height="79,4px"></a>
+    <% if logged_in? %>
     <h3 id="ask-a-question-button"><a href="/questions/new">Ask a Question</a></h3>
+    <% end %>
     <h3 class="questions-button"><a href="/questions">Questions</a></h3>
 
   </div>
diff --git a/app/views/questions/_individual_question.erb b/app/views/questions/_individual_question.erb
index 569c953..4eff771 100644
--- a/app/views/questions/_individual_question.erb
+++ b/app/views/questions/_individual_question.erb
@@ -1,4 +1,3 @@
 <tr>
 <td><a id = "question-title" href="/questions/<%=question.id%>"><%=question.title%></a></td>
 </tr>
-<!-- Stretch: Add username of the person who asked the question, and a post date -->
diff --git a/app/views/questions/index.erb b/app/views/questions/index.erb
index 33fcde1..5ca1e83 100644
--- a/app/views/questions/index.erb
+++ b/app/views/questions/index.erb
@@ -1,5 +1,8 @@
 <div class= "container">
-  <h1>Questions</h1>
+
+  <div class="profile-container">
+  <h1 class="orange-underline">Questions</h1>
+  </div>
 
   <h3><%= erb :'/_errors', layout: false %></h3>
   <form id = "question-form" class = "hidden" action = "/questions" method = "POST">
diff --git a/app/views/questions/show.erb b/app/views/questions/show.erb
index 06270a4..cb52f9b 100644
--- a/app/views/questions/show.erb
+++ b/app/views/questions/show.erb
@@ -1,52 +1,57 @@
 <div class= "container">
   <div class="question-title">
-  <h1><%=@question.title%><span class="vote-button"><%= erb :_vote_button %></span></h1>
+  <h1><%=@question.title%><% if logged_in? %><span class="vote-button"><%= erb :_question_vote_button %></span><% end %></h1>
   </div>
 
   <p class="question-description"><%=@question.description%></p>
 
-  <ul id ="question-comment-list">
-      <% @question.comments.each do |comment| %>
-      <div class = "question">
-        <%= erb :'/comments/_individual_comment', locals: {answer: @answer, question: @question, comment: comment} %>
-      <% end %>
-    </ul>
+  <div class="comments-container">
+    <h4 class="orange-underline">Comments</h4>
 
-<a class= 'add-question-comment-link' href= "#" >Add a comment to this question</a><br>
+  <% if logged_in? %>
+  <a class='add-question-comment-link' href= "#" ><h4 class="white">Add a comment</a></h4>
+  <% end %>
 
   <form action = "/questions/<%=@question.id%>/question_comment" method = "POST" class= "question-comment-form hidden">
     <input id = "#question-comment-description" type ="text" name= "description" placeholder= "Your Comment">
     <input type ="submit" value= "Submit Comment">
   </form>
 
- </div>
+
+  <ul id ="question-comment-list">
+      <% @question.comments.each do |comment| %>
+      <div class = "question">
+        <%= erb :'/comments/_individual_comment', locals: {answer: @answer, question: @question, comment: comment} %>
+      <% end %>
+    </ul>
 
   <form action = "/questions/<%=@question.id%>/question_comment" method = "POST" class= "comment-form hidden">
     <input type ="text" name= "description" placeholder= "Your Comment">
     <input type ="submit" value= "Submit Comment">
   </form>
 
+</div>
 
+  <div class="answer-container">
+  <h1 class="orange-underline">Answers</h1></div>
 
     <ul id= "answer-list">
-    <% @answers.each do |answer| %>
-      <div class = "answer" id = "<%=answer.id%>">
-        <%= erb :'/answers/_individual_answer', locals: {answer: answer, question: @question} %>
-      <ul class ="answer-comment-list">
-          <% answer.comments.each do |comment| %>
-            <%= erb :'/comments/_individual_comment', locals: {answer: answer, question: @question, comment: comment} %>
-          <% end %>
-        </ul>
-    <% end %>
-    </div>
-  </ul>
 
+    <% if logged_in? %>
     <h3><a id= "add-answer-button" href= "#">Add an Answer</a></h3>
+    <% end %>
 
     <form id= "answer-form" action = "/questions/<%=@question.id%>/answers" method = "POST" class= "hidden">
     <input type ="text" name= "description" placeholder= "Your Answer">
     <input type ="submit" value= "Submit Answer">
   </form>
 
+    <% @answers.each do |answer| %>
+      <div class = "answer">
+        <%= erb :'/answers/_individual_answer', locals: {answer: answer, question: @question} %>
+        <% end %>
+      </div>
+    </ul>
+  </div>
 
 </div>
diff --git a/app/views/sessions/login.erb b/app/views/sessions/login.erb
index 10e0f5b..55a3b4e 100644
--- a/app/views/sessions/login.erb
+++ b/app/views/sessions/login.erb
@@ -1,5 +1,10 @@
 <div class="container">
-  <h1>Login to TravelOverflow</h1>
+
+  <div class="profile-container">
+  <div class="orange-underline">
+  <h1 class="blue">Login to Travel Overflow!</h1>
+  </div>
+  </div>
 
 <% if @errors %>
   <% @errors.each do |error| %>
@@ -7,14 +12,18 @@
   <% end %>
 <% end %>
 
+<div class="sign-form-container">
+
 <form action = "/login" method = "POST">
-  <input type = "text" name= "username" placeholder = "username">
-  <input type = "password" name = "password" placeholder = "password">
-  <input type = "submit" value = "Login">
+  <input type = "text" name= "username" placeholder = "username" class="title-box"><br>
+  <input type = "password" name = "password" placeholder = "password" class="title-box"><br>
+  <input type = "submit" value = "Login" class="register-button">
 </form>
 
-<h3>Not registered?<a href="/users/new"> Sign up now!</a></h3>
-
+</div>
 
+<div class="profile-container">
+  <h3 class="blue">Not registered?<a href="/login" class="orange"> Sign up now!</a></h4>
+</div>
 
 </div>
diff --git a/app/views/users/new.erb b/app/views/users/new.erb
index 2dbd0fe..e0ed7ef 100644
--- a/app/views/users/new.erb
+++ b/app/views/users/new.erb
@@ -1,5 +1,10 @@
 <div class="container">
-<h1>Register for TravelOverflow!</h1>
+
+<div class="profile-container">
+<div class="orange-underline">
+<h1 class="blue">Register for Travel Overflow!</h1>
+</div>
+</div>
 
 <% if @errors %>
   <% errors.each do |error| %>
@@ -7,9 +12,18 @@
   <% end %>
 <% end %>
 
+<div class="sign-form-container">
+
 <form action = "/users" method = "POST">
-  <input type = "text" name= "user[username]" placeholder = "username">
-  <input type = "password" name= "user[password]" placeholder = "password">
-  <input type = "submit" value = "Register">
+  <input type = "text" name= "user[username]" placeholder = "username" class="title-box"><br>
+  <input type = "password" name= "user[password]" placeholder = "password" class="title-box"><br>
+  <input type = "submit" value = "Register" class="register-button">
 </form>
+
+</div>
+
+<div class="profile-container">
+  <h3 class="blue">Already registered?<a href="/login" class="orange"> Login in!</a></h4>
+</div>
+
 </div>
diff --git a/app/views/users/show.erb b/app/views/users/show.erb
index 3f107aa..f904937 100644
--- a/app/views/users/show.erb
+++ b/app/views/users/show.erb
@@ -1,39 +1,62 @@
 <div class="container">
-  <h1>Welcome, <%= @user.username.capitalize %>!</h1>
+  <h1 class="blue">Welcome, <%= @user.username.capitalize %>!</h1>
 
-  <h2>Questions</h2>
+  <div class="profile-container">
+  <h2 class="orange-underline">Your Questions</h2>
+  <table class="question-table">
   <% @user_questions.each do |question| %>
-  <p><a href="/questions/<%=question.id%>"><%= question.title %></a></p>
+  <tr>
+  <td><a href="/questions/<%=question.id%>"><%= question.title %></a></td>
   <% end %>
+  </tr>
+  </table>
+  </div>
 
-  <h2>Answers</h2>
+  <div class="profile-container">
+  <h2 class="orange-underline">Your Answers</h2>
+  <table class="question-table">
   <% @user_answers.each do |answer| %>
+  <tr>
   <% @question_answered %>
-  <p><a href="/questions/<%=@question_answered.id%>"><%=@question_answered.title%></a>  <%= answer.description %></p>
+  <td>Question:<a href="/questions/<%=@question_answered.id%>"> <%=@question_answered.title%></a><br>Answer: <%= answer.description %></td>
   <% end %>
+  </tr>
+  </table>
+  </div>
 
-  <h2>Comments on Questions</h2>
+  <div class="profile-container">
+  <h2 class="orange-underline">Comments on Questions</h2>
+  <table class="question-table">
   <% @user_comments.each do |comment| %>
     <% if comment.commentable_type == "Question" %>
       <% @commented_question_id = comment.commentable_id %>
       <% @question_commented_on = Question.find_by(id: @commented_question_id)%>
-      <a href="/questions/<%=@commented_question_id%>"><%= @question_commented_on.title %></a>
-      <%= comment.description %>
+      <tr>
+      <td>Question: <a href="/questions/<%=@commented_question_id%>"><%= @question_commented_on.title %></a><br>
+      Comment: <%= comment.description %></td>
       <% end %>
     <% end %>
+  </tr>
+  </table>
+  </div>
 
-  <h2>Comments on Answers</h2>
+  <div class="profile-container">
+  <h2 class="orange-underline">Comments on Answers</h2>
+  <table class="question-table">
   <% @user_comments.each do |comment| %>
     <% if comment.commentable_type == "Answer" %>
       <% @commented_answer_id = comment.commentable_id %>
       <% @answer_commented_on = Answer.find_by(id: @commented_answer_id)%>
       <% @question_of_commented_answer = Question.find_by(id: @answer_commented_on.question_id) %>
-
-      <p>Question: <a href="/question/<%@question_of_commented_answer.id%>"><%=@question_of_commented_answer.title%></a></p>
-      <p>Answer:<%= @answer_commented_on.description %></p>
-      <p>Comment:<%= comment.description %></p>
-      <% end %>
+      <tr>
+      <td>Question: <a href="/question/<%@question_of_commented_answer.id%>"><%=@question_of_commented_answer.title%></a><br>
+      Answer: <%= @answer_commented_on.description %><br>
+      Comment: <%= comment.description %>
+      <% end %></td>
     <% end %>
+  </tr>
+  </table>
+  </div>
 
 
 </div>
diff --git a/public/css/application.css b/public/css/application.css
index f50e465..ddf8b85 100644
--- a/public/css/application.css
+++ b/public/css/application.css
@@ -1,88 +1,14 @@
 body {
   background-color: #E7E7E7;
 }
+
 .container {
   margin-top: 12em;
   text-align: center;
-  padding-bottom: 5em;
-}
-
-#question-form {
-  background-color: #3A5863;
-  width: 44em;
-  height: 22em;
-  margin-left: auto;
-  margin-right: auto;
-}
-
-.white {
-  color: white;
+  padding-bottom: 15em;
 }
 
-.title-box {
-  height: 2em;
-  width: 30em;
-}
-
-.description-box {
-  height: 8em;
-  width: 30em;
-  word-wrap: break-word;
-  display: inline;
-  margin-top: 0;
-}
-.vote-button {
-  font-size: 12px;
-  display: inline-block;
-  float: right;
-}
-
-.question-table {
-  margin-left: auto;
-  margin-right: auto;
-}
-
-.question-table td {
-  padding: 2em;
-  background-color: #3A5863;
-  border: .5em solid;
-  border-color: #E7E7E7;
-  width: 40em;
-}
-
-.question-table a {
-  color: white;
-}
-
-.question-table a:hover {
-  color: #D86E3E;
-}
-
-.question-title {
-  width: 55em;
-  margin-left: auto;
-  margin-right: auto;
-  border-bottom: 5px solid;
-  border-color: #D86E3E;
-  color: #3A5863;
-  margin-bottom: 0;
-}
-
-.question-description {
-  margin-left: auto;
-  margin-right: auto;
-  width: 55em;
-  padding-right: 5em;
-  padding-left: 5em;
-}
-
-.question-description p {
-  font-size: 120%;
-  color: #3A5863;
-  word-wrap: break-word;
-}
-
-
+/* Header/Footer */
 #top-header {
   background-color: #3A5863;
   height: 2em;
@@ -208,3 +134,166 @@ body {
   display: none;
 }
 
+
+
+/* Ask a Question Section */
+#question-form {
+  background-color: #3A5863;
+  width: 44em;
+  height: 22em;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.vote-button {
+  font-size: 12px;
+  display: inline-block;
+  float: right;
+}
+
+.question-table {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+
+
+/* Question Show Page */
+
+.orange-underline {
+  border-bottom: 5px solid;
+  border-color: #D86E3E;
+  color: #3A5863;
+}
+
+.answer-container {
+  margin-left: auto;
+  margin-right: auto;
+  margin-top: 3em;
+  width: 40em;
+  color: #3A5863;
+  line-height: 2em;
+}
+
+.answer-container ul {
+  list-style-type: none;
+  padding: 0;
+}
+.add-question-comment-link a {
+  color: #3A5863;
+}
+
+.add-question-comment-link a:hover {
+  color: #D86E3E;
+}
+
+.comments-container {
+  margin-left: auto;
+  margin-right: auto;
+  margin-top: 3em;
+  width: 20em;
+  color: #3A5863;
+  line-height: 2em;
+}
+
+.comments-container ul {
+  list-style-type: none;
+  padding: 0;
+}
+
+.question-table td {
+  padding: 2em;
+  background-color: #3A5863;
+  border: .5em solid;
+  border-color: #E7E7E7;
+  width: 40em;
+}
+
+.question-table a {
+  color: white;
+}
+
+.question-table a:hover {
+  color: #D86E3E;
+}
+
+.question-title {
+  width: 55em;
+  margin-left: auto;
+  margin-right: auto;
+  border-bottom: 5px solid;
+  border-color: #D86E3E;
+  color: #3A5863;
+  margin-bottom: 0;
+}
+
+.question-description {
+  margin-left: auto;
+  margin-right: auto;
+  width: 40em;
+  word-wrap: break-word;
+  color: #3A5863;
+  font-size: 120%;
+}
+
+
+
+
+
+/* User Show Page */
+
+.profile-container {
+  margin-left: auto;
+  margin-right: auto;
+  margin-top: 3em;
+  width: 40em;
+  color: white;
+  line-height: 2em;
+}
+
+/* Change Font Colors */
+
+.blue {
+  color: #3A5863;
+}
+
+.orange {
+  color: #D86E3E;
+}
+
+.white {
+  color: white;
+}
+
+/* Sign Up/Login */
+.sign-form-container {
+  margin-left: auto;
+  margin-right: auto;
+  margin-top: 3em;
+  width: 35em;
+  line-height: 4.5em;
+  background-color: #3A5863;
+  padding: 1em;
+}
+
+/* Form input size changes */
+.title-box {
+  height: 2em;
+  width: 30em;
+}
+
+.description-box {
+  height: 8em;
+  width: 30em;
+  word-wrap: break-word;
+  display: inline;
+  margin-top: 0;
+}
+
+.register-button {
+  background-color: #D86E3E;
+  border:none;
+  font-size: 150%;
+  padding: .5em;
+  color: white;
+}
diff --git a/public/css/normalize.css b/public/css/normalize.css
index 15f23c5..86bc385 100644
--- a/public/css/normalize.css
+++ b/public/css/normalize.css
@@ -85,6 +85,7 @@ template {
 a {
   background: transparent;
   text-decoration: none;
+  color: #3A5863;
 }
 
 /**
@@ -94,8 +95,19 @@ a {
 a:active,
 a:hover {
   outline: 0;
+  color: #D86E3E;
 }
 
+/* BULLET POINTS ========================================================================== */
+ul {
+  list-style-type: none;
+  padding: 0;
+}
+
+li {
+  list-style-type: none;
+  padding: 0;
+}
 /* Text-level semantics
    ========================================================================== */
 
diff --git a/public/js/application.js b/public/js/application.js
index 341bd02..81fde4e 100644
--- a/public/js/application.js
+++ b/public/js/application.js
@@ -27,10 +27,7 @@ $(document).ready(function() {
       data: data
     });
     ajaxRequest.done(function(response){
-      $('.title-box').val('');
-      $('.description-box').val('');
-      $('#question-form').hide();
-      $('.question-table').prepend(response);
+      $('#question-list').append(response);
     });
   });
     $('#add-answer-button').on("click", function(e){
@@ -54,12 +51,10 @@ $(document).ready(function() {
       $('#answer-list').append(response);
     });
   });
-  $('.answer a').on("click", function(e){
+  $('.add-answer-comment-link').on("click", function(e){
     e.preventDefault();
-    $('.answer-comment-form').hide();
     $(this).hide()
-    $('#' + e.target.parentElement.id + ' form').show();
-    $('.answer a').show();
+    $('#' + this.parentElement.id + ' form').show();
   $('#' + e.target.parentElement.id + ' form').on("submit", function(e){
     e.preventDefault();
     var data = $(e.target).serialize();
@@ -70,12 +65,7 @@ $(document).ready(function() {
       type: type,
       data: data
     }).done(function(response){
-      if (e.target.parentElement.id == 1) {
-        $('ul.answer-comment-list').eq(0).append(response);
-      }
-      else{
-        $('#' + e.target.parentElement.id + ' ul.answer-comment-list').append(response);
-      };
+      $('#' + e.target.parentElement.id).children('ul').append(response);
       $('#' + e.target.parentElement.id + ' form').children('#answer-comment-description').val('');
     });
     });
@@ -101,5 +91,3 @@ $(document).ready(function() {
     });
     });
 });
-
-