4 files changed, 14 insertions, 17 deletions
diff --git a/app/views/alerts/_form.html.erb b/app/views/alerts/_form.html.erb
index b60eaf2..e7a2444 100644
--- a/app/views/alerts/_form.html.erb
+++ b/app/views/alerts/_form.html.erb
@@ -10,11 +10,6 @@
       </ul>
     </div>
   <% end %>
-
-  <div class="field">
-    <%= f.label :author_id %><br>
-    <%= f.text_field :author_id %>
-  </div>
   <div class="field">
     <%= f.label :message %><br>
     <%= f.text_area :message %>
diff --git a/app/views/alerts/index.html.erb b/app/views/alerts/index.html.erb
index 458b951..c978bea 100644
--- a/app/views/alerts/index.html.erb
+++ b/app/views/alerts/index.html.erb
@@ -12,14 +12,18 @@
   </thead>
 
   <tbody>
-    <% @alerts.each do |alert| %>
-      <tr>
-        <td><%= alert.author %></td>
-        <td><%= alert.message %></td>
-        <td><%= link_to 'Show', alert %></td>
-        <td><%= link_to 'Edit', edit_alert_path(alert) %></td>
-        <td><%= link_to 'Destroy', alert, method: :delete, data: { confirm: 'Are you sure?' } %></td>
-      </tr>
+    <% if !@alerts.nil? %>
+      <% @alerts.each do |alert| %>
+        <tr>
+          <td><%= alert.author.user_name %></td>
+          <td><%= alert.message %></td>
+          <td><%= link_to 'Show', alert %></td>
+          <td><%= link_to 'Edit', edit_alert_path(alert) %></td>
+          <td><%= link_to 'Destroy', alert, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+        </tr>
+      <% end %> 
+    <% else %>
+      <td><p>There are no alerts!</p></td>
     <% end %>
   </tbody>
 </table>
diff --git a/app/views/alerts/new.html.erb b/app/views/alerts/new.html.erb
index 6d04589..db5af2d 100644
--- a/app/views/alerts/new.html.erb
+++ b/app/views/alerts/new.html.erb
@@ -2,4 +2,4 @@
 
 <%= render 'form' %>
 
-<%= link_to 'Back', alerts_path %>
+<%= link_to 'See past Alerts', alerts_path %>
diff --git a/app/views/alerts/show.html.erb b/app/views/alerts/show.html.erb
index eeab7f7..398a10e 100644
--- a/app/views/alerts/show.html.erb
+++ b/app/views/alerts/show.html.erb
@@ -1,8 +1,6 @@
-<p id="notice"><%= notice %></p>
-
 <p>
   <strong>Author:</strong>
-  <%= @alert.author %>
+  <%= @alert.author.user_name %>
 </p>
 
 <p>