diff --git a/app/views/users/_addressDisplay.html.erb b/app/views/users/_addressDisplay.html.erb
index 87ce343..5a95ec3 100644
--- a/app/views/users/_addressDisplay.html.erb
+++ b/app/views/users/_addressDisplay.html.erb
@@ -9,31 +9,31 @@ $(function() {
 	<h3><a href="#home">Home</a></h3>
 	<div>
 		<p>
-			<%= render "addresses/quickshow.html.erb", :@address => params[:home] %>
+			<%= render "addresses/quickshow.html.erb", :@address => home %>
 		</p>
 	</div>
 	<h3><a href="#office">Office</a></h3>
 	<div>
 		<p>
-			<%= render "addresses/quickshow.html.erb", :@address => params[:office] %>
+			<%= render "addresses/quickshow.html.erb", :@address => office %>
 		</p>
 	</div>
 	<h3><a href="#school">School</a></h3>
 	<div>
 		<p>
-			<%= render "addresses/quickshow.html.erb", :@address => params[:school] %>
+			<%= render "addresses/quickshow.html.erb", :@address => school %>
 		</p>
 	</div>
 	<h3><a href="#travel">Travel</a></h3>
 	<div>
 		<p>
-			<%= render "addresses/quickshow.html.erb", :@address => params[:travel] %>
+			<%= render "addresses/quickshow.html.erb", :@address => travel %>
 		</p>
 	</div>
 	<h3><a href="#travel">Other</a></h3>
 	<div>
 		<p>
-			<%= render "addresses/quickshow.html.erb", :@address => params[:other] %>
+			<%= render "addresses/quickshow.html.erb", :@address => other %>
 		</p>
 	</div>
 
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 9bc5061..777db8f 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -2,19 +2,33 @@
   Welcome to NomAddress <%= @user.first_name%>!
   
   <p id="construction">The site is currently under construction, but you will be hearing from us soon!</p>
+  <p id="instruction">Select the address you would like to update below!</p>
  </div>
 
-<%= link_to "ABOUT PAGE", "/about" %>
-
-<div id="address">
-
-  <% @user.addresses.each do |a| %>
-    <%= render "addresses/quickshow.html.erb", :@address => a %>
-  <% end %>
-</div>
 <div id="user_box">
   <div id="buttons">
-  	<%= render "addressDisplay.html.erb" %>
+  <p id="notice" style="text-align:center"><%= notice %></p>	
+   <div id="buttons">
+	<% home = nil %>
+	<% office = nil %>  	
+	<% school = nil %>  	
+	<% travel = nil %>  	
+	<% other = nil %> 	
+	<% @user.addresses.each do |a| %>  	
+		<% if a.category == "Home" %> 	
+			<% home = a %>
+		<% elsif a.category == "Office" %>
+			<% office = a %>
+		<% elsif a.category == "School" %>
+			<% school = a %>
+		<% elsif a.category == "Travel" %>
+			<% travel = a %>
+		<% else %>
+			<% other = a %>
+		<% end %>
+	<% end %>  	
+<%= render :partial => "addressDisplay.html.erb", :locals => {:home => home, :office => office, :school => school, :travel => travel, :other => other} %>
+
   </div>
 
   <div id="dialog-form" title="Create new user">