diff --git a/app/controllers/articles_controller.rb b/app/controllers/articles_controller.rb
index c4d9a5e..0a79954 100644
--- a/app/controllers/articles_controller.rb
+++ b/app/controllers/articles_controller.rb
@@ -8,9 +8,23 @@ def show
     @article = Article.find(params[:id])
   end
 
-  def new
+  def edit
+    @article = Article.find(params[:id])
   end
 
+  def update
+    @article = Article.find(params[:id])
+
+    if @article.update(article_params)
+      redirect_to @article
+    else
+      render 'edit'
+    end
+  end
+
+  def new
+    @article = Article.new
+  end
 
   def create
 
diff --git a/app/views/articles/_form.html.erb b/app/views/articles/_form.html.erb
new file mode 100644
index 0000000..cadd083
--- /dev/null
+++ b/app/views/articles/_form.html.erb
@@ -0,0 +1,28 @@
+<%= form_for @article do |f| %>
+
+    <% if @article.errors.any? %>
+        <div id="error_explanation">
+          <h2><%= pluralize(@article.errors.count, "error") %> prohibited
+            this article from being saved:</h2>
+          <ul>
+            <% @article.errors.full_messages.each do |msg| %>
+                <li><%= msg %></li>
+            <% end %>
+          </ul>
+        </div>
+    <% end %>
+
+    <p>
+      <%= f.label :title %><br>
+      <%= f.text_field :title %>
+    </p>
+
+    <p>
+      <%= f.label :text %><br>
+      <%= f.text_area :text %>
+    </p>
+
+    <p>
+      <%= f.submit %>
+    </p>
+<% end %>
\ No newline at end of file
diff --git a/app/views/articles/edit.html.erb b/app/views/articles/edit.html.erb
new file mode 100644
index 0000000..b5a6f17
--- /dev/null
+++ b/app/views/articles/edit.html.erb
@@ -0,0 +1,5 @@
+<h1>Editing article</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Back', articles_path %>
\ No newline at end of file
diff --git a/app/views/articles/index.html.erb b/app/views/articles/index.html.erb
index 40a7a93..5846079 100644
--- a/app/views/articles/index.html.erb
+++ b/app/views/articles/index.html.erb
@@ -1,19 +1,20 @@
 <h1>Listing Articles</h1>
 
+<%= link_to 'New article', new_article_path %>
+
 <table>
   <tr>
     <th>Title</th>
     <th>Text</th>
+    <th colspan="2">Options</th>
   </tr>
 
   <% @articles.each do |article| %>
       <tr>
         <td><%= article.title %></td>
         <td><%= article.text %></td>
+        <td><%= link_to 'Show', article_path(article) %></td>
+        <td><%= link_to 'Edit', edit_article_path(article) %></td>
       </tr>
   <% end %>
-</table>
-
-<p>
-    <%= link_to 'New article', new_article_path %>
-</p>
+</table>
\ No newline at end of file
diff --git a/app/views/articles/new.html.erb b/app/views/articles/new.html.erb
index 205340e..505675b 100644
--- a/app/views/articles/new.html.erb
+++ b/app/views/articles/new.html.erb
@@ -1,32 +1,5 @@
 <h1>New Article</h1>
 
-<%= form_for :article, url: articles_path do |f| %>
-
-    <% if @article.errors.any? %>
-        <div id="error_explanation">
-          <h2><%= pluralize(@article.errors.count, "error") %> prohibited
-            this article from being saved:</h2>
-          <ul>
-            <% @article.errors.full_messages.each do |msg| %>
-                <li><%= msg %></li>
-            <% end %>
-          </ul>
-        </div>
-    <% end %>
-
-    <p>
-      <%= f.label :title %><br>
-      <%= f.text_field :title %>
-    </p>
-
-    <p>
-      <%= f.label :text %><br>
-      <%= f.text_area :text %>
-    </p>
-
-    <p>
-      <%= f.submit %>
-    </p>
-<% end %>
+<%= render 'form' %>
 
 <%= link_to 'Back', articles_path %>
\ No newline at end of file
diff --git a/app/views/articles/show.html.erb b/app/views/articles/show.html.erb
index 7361686..c0358fc 100644
--- a/app/views/articles/show.html.erb
+++ b/app/views/articles/show.html.erb
@@ -10,4 +10,5 @@
   <%= @article.text %>
 </p>
 
-<%= link_to 'Back', articles_path %>
\ No newline at end of file
+<%= link_to 'Back', articles_path %>
+| <%= link_to 'Edit', edit_article_path(@article) %>
\ No newline at end of file