diff --git a/app/controllers/main_controller.rb b/app/controllers/main_controller.rb
--- a/app/controllers/main_controller.rb
+++ b/app/controllers/main_controller.rb
@@ -6,6 +6,7 @@
          :redirect_to => { :action => :index }
 
   def index
+    redirect_to :action => 'login'
   end
 
   def login
diff --git a/app/views/main/index.rhtml b/app/views/main/index.rhtml
deleted file mode 100644
--- a/app/views/main/index.rhtml
+++ /dev/null
@@ -1,5 +0,0 @@
-<h1>Grader</h1>
-
-Welcome... first you need to 
-<%= link_to 'login', :controller => 'main', :action => 'login' %>
-to see problem list.
diff --git a/app/views/main/login.rhtml b/app/views/main/login.rhtml
--- a/app/views/main/login.rhtml
+++ b/app/views/main/login.rhtml
@@ -1,4 +1,7 @@
-<h1>Login</h1>
+<h1>Grader</h1>
+
+<b>Welcome back!</b><br/>
+Please login to see the problem list.<br/><br/>
 
 <% if flash[:notice] %>
 <hr>
@@ -6,6 +9,7 @@
 <hr>
 <% end %>
 
+<div style="border: solid 1px gray; padding: 2px; background: #f0f0f0;">
 <% form_tag :controller => 'login', :action => 'login' do %>
 <table>
 <tr>
@@ -17,3 +21,5 @@
 </table>
   <%= submit_tag 'Login' %>
 <% end %>
+</div>
+
diff --git a/config/routes.rb b/config/routes.rb
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -11,7 +11,7 @@
 
   # You can have the root of your site routed by hooking up '' 
   # -- just remember to delete public/index.html.
-  map.connect '', :controller => 'main'
+  map.connect '', :controller => 'main', :action => 'login'
 
   # Allow downloading Web Service WSDL as a file with an extension
   # instead of a file named 'wsdl'