diff --git a/app/assets/javascripts/toicontest.js b/app/assets/javascripts/toicontest.js
--- a/app/assets/javascripts/toicontest.js
+++ b/app/assets/javascripts/toicontest.js
@@ -1,7 +1,9 @@
 var TOIContest = {
     NO_TIMEOUT: -1,
+    SUBMISSION_TIMEOUT: 300,
     
     timeOuts: {},
+    timeStarted: 0,
     
     problemSelectClick: function() {
         $$(".submission-submit-divs").each(function(item) {
@@ -14,8 +16,18 @@
         $("submission_submit_div_" + problem_id + "_id").show();
     },
 
-    confirmDownload: function() {
-        return confirm("แน่ใจ?");
+    confirmDownload: function(pid) {
+        result = confirm("คุณแน่ใจที่จะส่งข้อนี้หรือไม่?\nเมื่อคุณดาวน์โหลดข้อมูลชุดทดสอบแล้ว คุณจะต้องส่งข้อมูลส่งออกและโปรแกรมภายในเวลา 5 นาที");
+        if ( result ) {
+            if ( TOIContest.timeOuts[ pid ] == TOIContest.NO_TIMEOUT ) {
+                TOIContest.refreshTimeOuts();
+
+                TOIContest.timeOuts[ pid ] = TOIContest.SUBMISSION_TIMEOUT;
+
+                TOIContest.refreshTimeOutMessages();
+            }
+        }
+        return result;
     },
 
     refreshTimeOutMessages: function() {
@@ -26,12 +38,40 @@
                     var minLeft = parseInt(timeOut / 60);
                     var secLeft = parseInt(timeOut % 60);
                     $('submission_time_left_' + pid + '_id').innerHTML = '| <b>เหลือเวลาอีก ' + minLeft + ':' + secLeft + ' นาที</b>';
+                    $('submission_form_'+ pid + '_id').show();
                 } else {
                     $('submission_time_left_' + pid + '_id').innerHTML = '| <b>หมดเวลาส่ง</a>';
                     $('submission_form_'+ pid + '_id').hide();
                 }
+            } else {
+                $('submission_form_'+ pid + '_id').hide();
             }
         }
-    }
+    },
+
+    refreshTimeOuts: function() {
+        if ( TOIContest.timeStarted == 0 ) {
+            TOIContest.timeStarted = (new Date()).getTime();
+        }
+        
+        var timeElapsed = ((new Date()).getTime() - TOIContest.timeStarted)/1000;
+        for ( var pid in TOIContest.timeOuts ) {
+            var timeOut = TOIContest.timeOuts[ pid ];
+            if ( timeOut > timeElapsed ) {
+                TOIContest.timeOuts[ pid ] -= timeElapsed;
+            } else if ( timeOut > 0 ) {
+                TOIContest.timeOuts[ pid ] = 0;
+            }
+        }
+    },
+    
+    registerRefreshEvent: function() {
+        TOIContest.timeStarted = (new Date()).getTime();
+        setTimeout(function () {
+            TOIContest.refreshTimeOuts();
+            TOIContest.refreshTimeOutMessages();
+            TOIContest.registerRefreshEvent();
+        }, 1000);
+    },
 };
 
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
@@ -1,3 +1,4 @@
+# coding: utf-8
 class MainController < ApplicationController
 
   before_filter :authenticate, :except => [:index, :login]
@@ -48,6 +49,10 @@
   end
 
   def list
+    if session[:current_problem_id]
+      @current_problem = Problem.find(session[:current_problem_id])
+      session[:current_problem_id] = nil
+    end
     prepare_list_information
   end
 
@@ -59,13 +64,35 @@
     user = User.find(session[:user_id])
 
     @submission = Submission.new
-    @submission.problem_id = params[:submission][:problem_id]
+    @current_problem = Problem.find(params[:submission][:problem_id])
+
+    if !@current_problem
+      flash[:notice] = 'Error: คุณยังไม่ได้ระบุข้อที่ต้องการส่ง'
+      redirect_to :action => 'list'
+    end
+
+    assignment = user.get_test_pair_assignment_for(@current_problem)
+    if !assignment
+      flash[:notice] = 'Error: คุณยังไม่ได้ดาวน์โหลดข้อมูลทดสอบ'
+      prepare_list_information
+      render :action => 'list' and return
+    end
+    if assignment.expired?
+      flash[:notice] = 'Error: หมดเวลาส่งสำหรับข้อนี้'
+      prepare_list_information
+      render :action => 'list' and return
+    end
+    
+    @submission.problem = @current_problem
     @submission.user = user
     @submission.language_id = 0
     if (params['file']) and (params['file']!='')
       @submission.source = params['file'].read 
       @submission.source_filename = params['file'].original_filename
     end
+    if (params['output_file']) and (params['output_file']!='')
+      @submission.output = params['output_file'].read 
+    end
     @submission.submitted_at = Time.new.gmtime
 
     if GraderConfiguration.time_limit_mode? and user.contest_finished?
@@ -80,11 +107,17 @@
       elsif Task.create(:submission_id => @submission.id, 
                         :status => Task::STATUS_INQUEUE) == false
 	flash[:notice] = 'Error adding your submission to task queue'
+      else
+        flash[:notice] = 'จัดเก็บคำตอบและโปรแกรมที่คุณส่งเรียบร้อย'
       end
     else
       prepare_list_information
       render :action => 'list' and return
     end
+
+    if @current_problem
+      session[:current_problem_id] = @current_problem.id
+    end
     redirect_to :action => 'list'
   end
 
@@ -225,15 +258,11 @@
       test_pair = TestPair.get_for(problem, true)
 
       user = User.find(session[:user_id])
-      assignent = user.get_test_pair_assignment_for(problem)
+      assignment = user.get_test_pair_assignment_for(problem)
 
-      if !assignent
-        assignent = TestPairAssignment.new
-        assignent.user = user
-        assignent.problem = problem
-        assignent.test_pair = test_pair
-        assignent.submitted = false
-        assignent.save
+      if !assignment
+        assignment = TestPairAssignment.create_for(user, problem, test_pair)
+        assignment.save
       end
 
       send_data(test_pair.input, 
@@ -252,17 +281,18 @@
       redirect_to :action => 'list' and return
     end
      
+    @current_problem = problem
     test_pair = TestPair.get_for(problem, false)
     if (params['output_file']) and (params['output_file']!='')
       output = params['output_file'].read   
 
-      @current_problem = problem
       @grading_result = grade(output, test_pair.solution)
       prepare_list_information
       render :action => 'list' and return
     else
       flash[:notice] = 'Error: output file errors'
-      redirect_to :action => 'list'
+      prepare_list_information
+      render :action => 'list' and return
     end
   end
 
diff --git a/app/models/submission.rb b/app/models/submission.rb
--- a/app/models/submission.rb
+++ b/app/models/submission.rb
@@ -10,6 +10,11 @@
   validates_presence_of :source
   validates_length_of :source, :maximum => 100_000, :allow_blank => true, :message => 'too long'
   validates_length_of :source, :minimum => 1, :allow_blank => true, :message => 'too short'
+
+  validates_presence_of :output
+  validates_length_of :output, :maximum => 100_000, :allow_blank => true, :message => 'too long'
+  validates_length_of :output, :minimum => 1, :allow_blank => true, :message => 'too short'
+
   validate :must_have_valid_problem
   validate :must_specify_language
 
diff --git a/app/models/test_pair_assignment.rb b/app/models/test_pair_assignment.rb
--- a/app/models/test_pair_assignment.rb
+++ b/app/models/test_pair_assignment.rb
@@ -6,4 +6,14 @@
   def expired?
     return created_at + TEST_ASSIGNMENT_EXPIRATION_DURATION < Time.new.gmtime 
   end
+
+  def self.create_for(user, problem, test_pair)
+    assignment = TestPairAssignment.new
+    assignment.user = user
+    assignment.problem = problem
+    assignment.test_pair = test_pair
+    assignment.submitted = false
+    assignment.save
+    return assignment
+  end
 end
diff --git a/app/views/main/_submission_box.html.erb b/app/views/main/_submission_box.html.erb
--- a/app/views/main/_submission_box.html.erb
+++ b/app/views/main/_submission_box.html.erb
@@ -1,13 +1,14 @@
+<% selected_problem_id = @current_problem ? @current_problem.id : -1 %>
 <div class="submitbox">
   <b>Problem:</b> <%= select 'submission', 'problem_id', 
              	      [['กรุณาเลือกข้อที่ต้องการส่งหรือทดสอบ','-1']] + 
 		      @problems.collect {|p| [p.full_name, p.id]},
-		      { :selected => '-1' },
+		      { :selected => selected_problem_id },
                       { :onchange => 'TOIContest.problemSelectClick()' } %>
 </div>
 
 <% @problems.each do |problem| %>
-  <div class="submission-submit-divs" id="submission_submit_div_<%= problem.id %>_id" style="displanny: none;">
+  <div class="submission-submit-divs" id="submission_submit_div_<%= problem.id %>_id" style="display: none;">
     <div style="border: 1px solid #c0c0c0; padding: 5px; margin: 5px 0 5px 0;">
       <b><%= problem.full_name %>: ข้อมูลสำหรับตรวจสอบ</b> (สามารถดาวน์โหลดและส่งกี่ครั้งก็ได้,ไม่มีคะแนน): 
       <%= link_to 'ดาวน์โหลด input', :action => 'verifying_testcase', :id => problem.id %>
@@ -24,11 +25,12 @@
     </div>
     <div style="border: 1px solid #c0c0c0; padding: 5px; margin: 5px 0 5px 0;">
       <b><%= problem.full_name %>: ข้อมูลทดสอบจริง</b> (ส่งกี่ครั้งก็ได้ภายในเวลา 5 นาทีหลังดาวน์โหลด):
-      <%= link_to 'ดาวน์โหลด input และเริ่มจับเวลา', { :action => 'testcase', :id => problem.id}, { :onclick => 'return TOIContest.confirmDownload()' } %>
+      <%= link_to 'ดาวน์โหลด input และเริ่มจับเวลา', { :action => 'testcase', :id => problem.id}, { :onclick => "return TOIContest.confirmDownload(#{problem.id})" } %>
       <span id="submission_time_left_<%= problem.id %>_id"></span>
-      <%= form_tag({:controller => 'main', :action => 'submit', :id => problem.id}, {:method => 'post', :multipart => true, :id => "submission_form_#{problem.id}_id" }) do %>
+      <%= form_tag({:controller => 'main', :action => 'submit'}, {:method => 'post', :multipart => true, :id => "submission_form_#{problem.id}_id" }) do %>
+        <%= hidden_field_tag 'submission[problem_id]', problem.id %>
         ข้อมูลส่งออก: <%= file_field_tag 'output_file' %>
-        โปรแกรมคำตอบ: <%= file_field_tag 'source_file' %>
+        โปรแกรมคำตอบ: <%= file_field_tag 'file' %>
         <%= submit_tag 'Submit' %>
       <% end %>
     </div>
diff --git a/app/views/main/list.html.haml b/app/views/main/list.html.haml
--- a/app/views/main/list.html.haml
+++ b/app/views/main/list.html.haml
@@ -49,6 +49,8 @@
   = "Announcement.refreshUrl = '#{url_for :controller => 'main', :action => 'announcements'}';"
   Announcement.registerRefreshEventTimer();
 
+  TOIContest.problemSelectClick()
+
   TOIContest.timeOuts = {};
   - @problems.each do |p|
     - if (@submission_timeouts.has_key? p.id) and (@submission_timeouts[p.id] != nil)
@@ -57,3 +59,4 @@
       = "TOIContest.timeOuts[#{p.id}] = TOIContest.NO_TIMEOUT;"
 
   TOIContest.refreshTimeOutMessages();
+  TOIContest.registerRefreshEvent();
diff --git a/db/migrate/20150129021221_add_output_to_submissions.rb b/db/migrate/20150129021221_add_output_to_submissions.rb
new file mode 100644
--- /dev/null
+++ b/db/migrate/20150129021221_add_output_to_submissions.rb
@@ -0,0 +1,5 @@
+class AddOutputToSubmissions < ActiveRecord::Migration
+  def change
+    add_column :submissions, :output, :text
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20150128165518) do
+ActiveRecord::Schema.define(:version => 20150129021221) do
 
   create_table "announcements", :force => true do |t|
     t.string   "author"
@@ -166,6 +166,7 @@
     t.text     "grader_comment"
     t.integer  "number"
     t.string   "source_filename"
+    t.text     "output"
   end
 
   add_index "submissions", ["user_id", "problem_id", "number"], :name => "index_submissions_on_user_id_and_problem_id_and_number", :unique => true