diff --git a/app/views/graders/submission.html.haml b/app/views/graders/submission.html.haml
--- a/app/views/graders/submission.html.haml
+++ b/app/views/graders/submission.html.haml
@@ -1,22 +1,67 @@
+%style{type: "text/css"}
+  = @css_style
+:css
+  .field {
+    font-weight: bold;
+    text-align: right;
+    padding: 3px;
+  }
+
+
 %h1= "Submission: #{@submission.id}"
 
-%p
-  User:
-  = "#{@submission.user.login}"
-  %br/
-  Problem: 
-  - if @submission.problem!=nil
-    = "#{@submission.problem.full_name}"
-  - else
-    = "(n/a)"
-  %br/
-  = "Number: #{@submission.number}"
-  %br/
-  = "Submitted at: #{format_short_time(@submission.submitted_at)}"
+
+%h2 Stat
 
-%b Source code (first 10kb)
-%div{:style => "border: 1px solid black; background: lightgrey"}
-  - if @submission.source
-    %pre
-      =h truncate @submission.source, :length => 10240
+%table.info
+  %thead
+    %tr.info-head
+      %th Field
+      %th Value
+  %tbody
+    %tr{class: cycle('info-even','info-odd')}
+      %td.field User:
+      %td.value
+        - if @submission.user 
+          = link_to "(#{@submission.user.login})", controller: "users", action: "profile", id: @submission.user
+          = @submission.user.full_name
+        - else
+          = "(n/a)"
+    %tr{class: cycle('info-even','info-odd')}
+      %td.field Problem:
+      %td.value
+        - if @submission.problem!=nil
+          = link_to "(#{@submission.problem.name})", controller: "problems", action: "stat", id: @submission.problem
+          = @submission.problem.full_name
+        - else
+          = "(n/a)"
+    %tr{class: cycle('info-even','info-odd')}
+      %td.field Tries:
+      %td.value= @submission.number
+    %tr{class: cycle('info-even','info-odd')}
+      %td.field Submitted:
+      %td.value #{time_ago_in_words(@submission.submitted_at)} ago (at #{@submission.submitted_at.to_formatted_s(:long)})
+    %tr{class: cycle('info-even','info-odd')}
+      %td.field Graded:
+      %td.value #{time_ago_in_words(@submission.graded_at)} ago (at #{@submission.graded_at.to_formatted_s(:long)})
+    %tr{class: cycle('info-even','info-odd')}
+      %td.field Points:
+      %td.value #{@submission.points}/#{@submission.problem.full_score}
+    %tr{class: cycle('info-even','info-odd')}
+      %td.field Comment:
+      %td.value #{@submission.grader_comment}
+    %tr{class: cycle('info-even','info-odd')}
+      %td.field Runtime (s):
+      %td.value #{@submission.max_runtime}
+    %tr{class: cycle('info-even','info-odd')}
+      %td.field Memory (kb):
+      %td.value #{@submission.peak_memory}
+    - if session[:admin]
+      %tr{class: cycle('info-even','info-odd')}
+        %td.field IP:
+        %td.value #{@submission.ip_address}
 
+%h2 Source code
+//%div.highlight{:style => "border: 1px solid black;"}
+=@formatted_code.html_safe
+