diff --git a/app/controllers/forms_controller.rb b/app/controllers/forms_controller.rb
index 924395a..92c2ece 100644
--- a/app/controllers/forms_controller.rb
+++ b/app/controllers/forms_controller.rb
@@ -25,10 +25,8 @@ class FormsController < ApplicationController
     end
   end
 
-  if Rails.env.development?
-    def form
-      @form = Form.find_by!(token: params[:id])
-    end
+  def form
+    @form = Form.find_by!(token: params[:id])
   end
 
   private
diff --git a/app/views/forms/form.html.erb b/app/views/forms/form.html.erb
index 22d1502..b3f6ebb 100644
--- a/app/views/forms/form.html.erb
+++ b/app/views/forms/form.html.erb
@@ -1,22 +1,12 @@
 <h1><%= @form.title %></h1>
-<p>
-  <%= link_to 'Google spreadsheet', @form.google_spreadsheet_url %>
-</p>
-<form method="post" action="<%= submission_url(@form) %>" enctype="multipart/form-data">
 
-  <p>
-    <label>Text</label>
-    <input type="text" name="text">
-  </p>
-  <p>
-    <label>Array</label>
-    <input type="checkbox" name="array[]" value="1">
-    <input type="checkbox" name="array[]" value="2">
-    <input type="checkbox" name="array[]" value="3">
-  </p>
-  <p>
-    <label>File</label>
-    <input type="file" name="file">
-  </p>
-  <input type="submit" value="senden">
-</form>
+<%= form_with url: submission_url(@form), action: 'post', authenticity_token: false, local: true, html: { enctype: 'multipart/form-data' } do %>
+  <% @form.header_values.each do |header| %>
+    <p>
+      <label><%= header %>
+      <%= text_field_tag header %>
+    </p>
+  <% end %>
+
+  <%= submit_tag 'Send', name: nil %>
+<% end %>
diff --git a/config/routes.rb b/config/routes.rb
index 7e54f35..a939654 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -2,9 +2,7 @@ Rails.application.routes.draw do
   # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html
 
   resources :forms do
-    if Rails.env.development?
-      member { get :form }
-    end
+    member { get :form }
     resources :submissions
   end
   # short link for submission file uploads