diff --git a/app/controllers/forms_controller.rb b/app/controllers/forms_controller.rb
index 92c2ece..4b0ac01 100644
--- a/app/controllers/forms_controller.rb
+++ b/app/controllers/forms_controller.rb
@@ -25,6 +25,19 @@ class FormsController < ApplicationController
     end
   end
 
+  def edit
+    @form = current_user.forms.find_by!(token: params[:id])
+  end
+
+  def update
+    @form = current_user.forms.find_by!(token: params[:id])
+    if @form.update(form_params)
+      redirect_to form_url(@form)
+    else
+      render :edit
+    end
+  end
+
   def form
     @form = Form.find_by!(token: params[:id])
   end
diff --git a/app/views/forms/_form.html.erb b/app/views/forms/_form.html.erb
new file mode 100644
index 0000000..c03993b
--- /dev/null
+++ b/app/views/forms/_form.html.erb
@@ -0,0 +1,15 @@
+<%= form_for form, local: true do |f| %>
+  <div class="field">
+    <div class="control">
+      <%= f.text_field :title, class: 'input', placeholder: 'Title' %>
+    </div>
+  </div>
+  <div class="field">
+    <div class="control">
+      <%= f.text_field :thank_you_url, class: 'input', placeholder: 'Thank you url' %>
+    </div>
+  </div>
+  <div>
+    <%= f.submit class: 'button is-primary' %>
+  </div>
+<% end %>
diff --git a/app/views/forms/edit.html.erb b/app/views/forms/edit.html.erb
new file mode 100644
index 0000000..4e04451
--- /dev/null
+++ b/app/views/forms/edit.html.erb
@@ -0,0 +1,14 @@
+<div class="section">
+  <div class=" columns ">
+    <div class="column is-half is-offset-one-quarter">
+      <div class="box">
+        <div class="content has-text-centered">
+          <h1 class="has-text-weight-light">Update <%= @form.title %></h1>
+
+          <%= render 'form', form: @form %>
+
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/app/views/forms/new.html.erb b/app/views/forms/new.html.erb
index 1229375..ac8f1aa 100644
--- a/app/views/forms/new.html.erb
+++ b/app/views/forms/new.html.erb
@@ -4,21 +4,9 @@
       <div class="box">
         <div class="content has-text-centered">
           <h1 class="has-text-weight-light">Create a new form</h1>
-          <%= form_for @form do |f| %>
-          <div class="field">
-            <div class="control">
-              <%= f.text_field :title, class: 'input', placeholder: 'Title' %>
-            </div>
-          </div>
-          <div class="field">
-            <div class="control">
-              <%= f.text_field :thank_you_url, class: 'input', placeholder: 'Thank you url' %>
-            </div>
-          </div><br>
-          <div>
-            <%= f.submit class: 'button is-primary' %>
-            <% end %>
-          </divdiv>
+
+          <%= render 'form', form: @form %>
+
         </div>
       </div>
     </div>