diff --git a/app/views/main/_problem.html.haml b/app/views/main/_problem.html.haml
--- a/app/views/main/_problem.html.haml
+++ b/app/views/main/_problem.html.haml
@@ -1,13 +1,15 @@
-.problem-panel{:id => "problem-panel-#{problem.id}", :style => "display:none"}
+.problem-panel{:id => "problem-panel-#{problem.id}", :style => "#{(problem.id != @current_problem_id) ? "display:none" : ""}"}
   .problem-form{:id => "problem-form-#{problem.id}"}
     - form_tag({ :action => 'download_input', :id => problem.id }, :method => :post) do
       %b Input:
       %input{:type => "submit", :value => "Download input"}
-      = "After downloading, you have #{TEST_ASSIGNMENT_EXPIRATION_DURATION/60} minutes to submit."
-    - form_tag({ :action => 'submit_solution', :id => problem.id }, :method => :post, :multipart => true) do
-      %b Submit output:
-      %input{:type => "file", :name => "file"}
-      %input{:type => "submit", :value => "Submit solution"}
+      %span{:id => "problem-timing-message-#{problem.id}"}
+        = "After downloading, you have #{TEST_ASSIGNMENT_EXPIRATION_DURATION/60} minutes to submit."
+    %div{:id => "problem-submission-form-#{problem.id}"}
+      - form_tag({ :action => 'submit_solution', :id => problem.id }, :method => :post, :multipart => true) do
+        %b Submit output:
+        %input{:type => "file", :name => "file"}
+        %input{:type => "submit", :value => "Submit solution"}
 
   .problem-description
     - if problem.description!=nil