diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index b043beb..96802ff 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -3,8 +3,9 @@
   <head>
     <title>Adopt a Hydrant</title>
     <%= stylesheet_link_tag "main" %>
-    <%= javascript_include_tag "https://ajax.googleapis.com/ajax/libs/jquery/1/jquery.min.js" %>
     <%= javascript_include_tag "http://maps.google.com/maps/api/js?sensor=false" %>
+    <%= javascript_include_tag "https://ajax.googleapis.com/ajax/libs/jquery/1/jquery.min.js" %>
+    <%= javascript_include_tag "https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.10/jquery-ui.min.js" %>
     <%= javascript_include_tag "https://github.com/scottschiller/Snowstorm/raw/master/snowstorm-min.js" %>
     <script type="text/javascript">
     $(function() {
@@ -62,6 +63,16 @@
   <% end %>
       addMarker(point, color, contentString);
 <% end %>
+      $('#location_form').submit(function() {
+        if($("#address").val() === "") {
+          $('#address_label').addClass('error', 500);
+          $('#address').addClass('error', 500);
+          $('#address').focus();
+          return false;
+        } else {
+          return true;
+        }
+      });
       $('.box input[type="radio"]').live('click', function() {
         var self = $(this);
         if('new' == self.val()) {
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index bcfce54..59b81c0 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -3,10 +3,10 @@
   <p id="tagline">
     Claim responsibility for shoveling out a fire hydrant after it snows.
   </p>
-  <%= form_tag "/", :method => :get, :class => "location_form" do %>
-    <%= label_tag "city_state", "City" %>
+  <%= form_tag "/", :method => "GET", :id => "location_form" do %>
+    <%= label_tag "city_state", "City", :id => "city_label" %>
     <%= select_tag "city_state", '<option value="Boston, MA" selected="selected">Boston, MA</option>'.html_safe, :tabindex => 10 %>
-    <%= label_tag "address" %>
+    <%= label_tag "address", "Address", :id => "address_label" %>
     <%= text_field_tag "address", params[:address], :tabindex => 11 %>
     <%= submit_tag "Find Fire Hydrants", :tabindex => 12 %>
   <% end %>
