diff --git a/features/homepage.feature b/features/homepage.feature
index 588787a..a6c98ce 100644
--- a/features/homepage.feature
+++ b/features/homepage.feature
@@ -4,6 +4,8 @@ Feature: Homepage
 
   Loading the homepage is the initial starting point for this tool
 
-  Scenario: Homepage Loads
+  Scenario: Homepage Loads with a form
     Given I visit the homepage
-    Then I should see "URL Shortener"
+    Then I should see text "URL Shortener"
+    And I should see a form field "url"
+    And I should see a "Submit" button
diff --git a/features/step_definitions/steps.rb b/features/step_definitions/steps.rb
index da975ee..61271d9 100644
--- a/features/step_definitions/steps.rb
+++ b/features/step_definitions/steps.rb
@@ -1,7 +1,7 @@
 # GIVEN
 
 Given('I visit the homepage') do
-    visit '/'
+  visit '/'
 end
 
 # WHEN
@@ -10,6 +10,14 @@ end
 
 # THEN
 
-Then('I should see {string}') do |string|
-    page.should have_content "URL Shortener"
+Then('I should see text {string}') do |string|
+  page.should have_content string
+end
+
+Then('I should see a form field {string}') do |string|
+  page.should have_field string
+end
+
+Then('I should see a {string} button') do |string|
+  page.should have_button string
 end
diff --git a/views/home.erb b/views/home.erb
index e90e2c6..11e6885 100644
--- a/views/home.erb
+++ b/views/home.erb
@@ -5,5 +5,5 @@
     placeholder="http://www.example.com/"
     style="padding: 0.5rem;"
     required />
-  <input type="submit" value="Submit" style="padding: 0.5rem;" />
+  <button type="submit" style="padding: 0.5rem;">Submit</button>
 </form>