diff --git a/app/views/form/age.html.erb b/app/views/form/age.html.erb
deleted file mode 100644
index 6836f7080..000000000
--- a/app/views/form/age.html.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<%= turbo_frame_tag "form" %>
-  <%= form_with url:'/test', builder: GOVUKDesignSystemFormBuilder::FormBuilder do |f| %>
-    <%= f.govuk_number_field :age, label: { text: "Test" } %>
-    <%= f.govuk_submit %>
-  <% end %>
\ No newline at end of file
diff --git a/app/views/form/index.html.erb b/app/views/form/index.html.erb
index 27eb369a1..7889ea55a 100644
--- a/app/views/form/index.html.erb
+++ b/app/views/form/index.html.erb
@@ -1,17 +1,8 @@
-<%= form_with url:'/test', builder: GOVUKDesignSystemFormBuilder::FormBuilder do |f| %>
-  <%= f.govuk_number_field :age, label: { text: "Age" } %>
+<%= form_with builder: GOVUKDesignSystemFormBuilder::FormBuilder do |f| %>
+  <%= f.govuk_number_field :age,
+        hint: { text: "More detail" },
+        label: { text: "What is the tenant's age?", size: "l"},
+        min: 0, max: 150, step: 1, width: 20
+  %>
   <%= f.govuk_submit %>
-  <% end %>
-
-  <%= link_to "/age", class: "govuk-header__link govuk-header__link--homepage" do %>
-    <span class="govuk-header__logotype">
-      <svg role="presentation" focusable="false" class="govuk-header__logotype-crown" xmlns="http://www.w3.org/2000/svg" viewbox="0 0 132 97" height="32" width="36">
-        <path fill="currentColor" fill-rule="evenodd" d="M25 30.2c3.5 1.5 7.7-.2 9.1-3.7 1.5-3.6-.2-7.8-3.9-9.2-3.6-1.4-7.6.3-9.1 3.9-1.4 3.5.3 7.5 3.9 9zM9 39.5c3.6 1.5 7.8-.2 9.2-3.7 1.5-3.6-.2-7.8-3.9-9.1-3.6-1.5-7.6.2-9.1 3.8-1.4 3.5.3 7.5 3.8 9zM4.4 57.2c3.5 1.5 7.7-.2 9.1-3.8 1.5-3.6-.2-7.7-3.9-9.1-3.5-1.5-7.6.3-9.1 3.8-1.4 3.5.3 7.6 3.9 9.1zm38.3-21.4c3.5 1.5 7.7-.2 9.1-3.8 1.5-3.6-.2-7.7-3.9-9.1-3.6-1.5-7.6.3-9.1 3.8-1.3 3.6.4 7.7 3.9 9.1zm64.4-5.6c-3.6 1.5-7.8-.2-9.1-3.7-1.5-3.6.2-7.8 3.8-9.2 3.6-1.4 7.7.3 9.2 3.9 1.3 3.5-.4 7.5-3.9 9zm15.9 9.3c-3.6 1.5-7.7-.2-9.1-3.7-1.5-3.6.2-7.8 3.7-9.1 3.6-1.5 7.7.2 9.2 3.8 1.5 3.5-.3 7.5-3.8 9zm4.7 17.7c-3.6 1.5-7.8-.2-9.2-3.8-1.5-3.6.2-7.7 3.9-9.1 3.6-1.5 7.7.3 9.2 3.8 1.3 3.5-.4 7.6-3.9 9.1zM89.3 35.8c-3.6 1.5-7.8-.2-9.2-3.8-1.4-3.6.2-7.7 3.9-9.1 3.6-1.5 7.7.3 9.2 3.8 1.4 3.6-.3 7.7-3.9 9.1zM69.7 17.7l8.9 4.7V9.3l-8.9 2.8c-.2-.3-.5-.6-.9-.9L72.4 0H59.6l3.5 11.2c-.3.3-.6.5-.9.9l-8.8-2.8v13.1l8.8-4.7c.3.3.6.7.9.9l-5 15.4v.1c-.2.8-.4 1.6-.4 2.4 0 4.1 3.1 7.5 7 8.1h.2c.3 0 .7.1 1 .1.4 0 .7 0 1-.1h.2c4-.6 7.1-4.1 7.1-8.1 0-.8-.1-1.7-.4-2.4V34l-5.1-15.4c.4-.2.7-.6 1-.9zM66 92.8c16.9 0 32.8 1.1 47.1 3.2 4-16.9 8.9-26.7 14-33.5l-9.6-3.4c1 4.9 1.1 7.2 0 10.2-1.5-1.4-3-4.3-4.2-8.7L108.6 76c2.8-2 5-3.2 7.5-3.3-4.4 9.4-10 11.9-13.6 11.2-4.3-.8-6.3-4.6-5.6-7.9 1-4.7 5.7-5.9 8-.5 4.3-8.7-3-11.4-7.6-8.8 7.1-7.2 7.9-13.5 2.1-21.1-8 6.1-8.1 12.3-4.5 20.8-4.7-5.4-12.1-2.5-9.5 6.2 3.4-5.2 7.9-2 7.2 3.1-.6 4.3-6.4 7.8-13.5 7.2-10.3-.9-10.9-8-11.2-13.8 2.5-.5 7.1 1.8 11 7.3L80.2 60c-4.1 4.4-8 5.3-12.3 5.4 1.4-4.4 8-11.6 8-11.6H55.5s6.4 7.2 7.9 11.6c-4.2-.1-8-1-12.3-5.4l1.4 16.4c3.9-5.5 8.5-7.7 10.9-7.3-.3 5.8-.9 12.8-11.1 13.8-7.2.6-12.9-2.9-13.5-7.2-.7-5 3.8-8.3 7.1-3.1 2.7-8.7-4.6-11.6-9.4-6.2 3.7-8.5 3.6-14.7-4.6-20.8-5.8 7.6-5 13.9 2.2 21.1-4.7-2.6-11.9.1-7.7 8.8 2.3-5.5 7.1-4.2 8.1.5.7 3.3-1.3 7.1-5.7 7.9-3.5.7-9-1.8-13.5-11.2 2.5.1 4.7 1.3 7.5 3.3l-4.7-15.4c-1.2 4.4-2.7 7.2-4.3 8.7-1.1-3-.9-5.3 0-10.2l-9.5 3.4c5 6.9 9.9 16.7 14 33.5 14.8-2.1 30.8-3.2 47.7-3.2z"></path>
-        <image src="<%= asset_pack_path('media/images/govuk-logotype-crown.png') %>" class="govuk-header__logotype-crown-fallback-image"></image>
-      </svg>
-      <span class="govuk-header__logotype-text">
-        GOV.UK
-      </span>
-    </span>
-    <% end %>
-
+<% end %>
diff --git a/app/views/questions/_numeric_question.html.erb b/app/views/questions/_numeric_question.html.erb
deleted file mode 100644
index 1188a87c4..000000000
--- a/app/views/questions/_numeric_question.html.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<div class="govuk-form-group">
-    <label for="numeric_input"><%= label %></label>
-    <div id="numeric_hint" class="govuk-hint">
-        <%= hint_text %>
-    </div>
-    <input id="numeric_input" class="govuk-input govuk-input--width-20" type="number" min=<%= minimum %> max=<%= maximum %> />
-</div>
\ No newline at end of file
diff --git a/spec/features/form_spec.rb b/spec/features/form_spec.rb
index 7fb2779c2..87668de5f 100644
--- a/spec/features/form_spec.rb
+++ b/spec/features/form_spec.rb
@@ -2,7 +2,7 @@ require "rails_helper"
 RSpec.describe "Test Features" do
   it "Displays the name of the app" do
     visit("/form")
-    expect(page).to have_field("Age")
+    expect(page).to have_field("age")
     expect(page).to have_button("Continue")
   end
 end
diff --git a/spec/views/questions/_numeric_question.html.erb_spec.rb b/spec/views/questions/_numeric_question.html.erb_spec.rb
deleted file mode 100644
index 8949790f7..000000000
--- a/spec/views/questions/_numeric_question.html.erb_spec.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-describe "questions/_numeric_question.html.erb" do
-  context "when given a label, value constraints and hint text" do
-    let(:label) { "Test Label" }
-    let(:min) { "1" }
-    let(:max) { "150" }
-    let(:hint_text) { "Some text that describes the question in more detail" }
-    let(:locals) { { label: label, minimum: min, maximum: max, hint_text: hint_text } }
-
-    before(:each) do
-      render partial: "numeric_question", locals: locals
-    end
-
-    it "displays a numeric entry field with a label" do
-      expect(rendered).to have_selector('//input[@type="number"]')
-      expect(rendered).to have_selector("//label[contains('#{label}')]")
-    end
-
-    it "validates for a given minimum input" do
-      expect(rendered).to have_selector("//input[@min=#{min}]")
-    end
-
-    it "validates for a given maximum input" do
-      expect(rendered).to have_selector("//input[@max=#{max}]")
-    end
-
-    it "displays hint text" do
-      expect(rendered).to have_selector("//div[@class='govuk-hint']")
-      expect(rendered).to have_css("#numeric_hint", text: hint_text.to_s)
-    end
-  end
-end