diff --git a/app/views/locations/index.html.erb b/app/views/locations/index.html.erb
index f13c2e9..1b0e61a 100644
--- a/app/views/locations/index.html.erb
+++ b/app/views/locations/index.html.erb
@@ -1,2 +1,15 @@
-<h1>Location</h1>
-<p>Welcome to Where's It At?!</p>
+<h1>Locations</h1>
+<br />
+<% @locations.each do |location| %>
+  <b>Address:</b> <%= location.address %>
+  <br />
+  <b>Latitude:</b> <%= location.latitude %>
+  <br />
+  <b>Longitude:</b> <%= location.longitude %>
+  <br />
+  <%= link_to "View", location %>
+  <br />
+<% end %>
+<br />
+<br />
+<%= link_to "New", new_location_path %>
diff --git a/app/views/locations/show.html.erb b/app/views/locations/show.html.erb
index 3d80d65..134b860 100644
--- a/app/views/locations/show.html.erb
+++ b/app/views/locations/show.html.erb
@@ -1,5 +1,7 @@
-Address: <%= @location.address %>
+<h2><%= @location.address %></h2>
 <br />
 Latitude: <%= @location.latitude %>
 <br />
 Longitude: <%= @location.longitude %>
+<br />
+<%= link_to "Home", root_path %>