diff --git a/app/views/submissions/show.html.haml b/app/views/submissions/show.html.haml
new file mode 100644
--- /dev/null
+++ b/app/views/submissions/show.html.haml
@@ -0,0 +1,84 @@
+%h1= "Submission: #{@submission.id}"
+
+%textarea#data{style: "display:none;"}
+  :preserve
+    #{@submission.source}
+
+//%div.highlight{:style => "border: 1px solid black;"}
+//=@formatted_code.html_safe
+.containter
+  .row
+    .col-md-7
+      %h2 Source Code
+    .col-md-5
+      %h2 Stat
+  .row
+    .col-md-7
+      %div#editor{ style: "font-size: 14px; height: 400px; border-radius:5px;" }
+      :javascript
+        e = ace.edit("editor")
+        e.setOptions({ maxLines: Infinity })
+        e.setValue($("#data").text())
+        e.gotoLine(1)
+        e.getSession().setMode("#{get_ace_mode(@submission.language)}")
+        e.setReadOnly(true)
+    .col-md-5
+      %table.table.table-striped
+        %tr
+          %td.text-right
+            %strong User
+          %td
+            - if @submission.user 
+              = link_to "(#{@submission.user.login})", controller: "users", action: "profile", id: @submission.user
+              = @submission.user.full_name
+            - else
+              = "(n/a)"
+        %tr
+          %td.text-right
+            %strong Task
+          %td
+            - if @submission.problem!=nil
+              = link_to "(#{@submission.problem.name})", controller: "problems", action: "stat", id: @submission.problem
+              = @submission.problem.full_name
+            - else
+              = "(n/a)"
+        %tr
+          %td.text-right
+            %strong Tries
+          %td= @submission.number
+        %tr
+          %td.text-right
+            %strong Language
+          %td= @submission.language.pretty_name
+        %tr
+          %td.text-right
+            %strong Submitted
+          %td #{time_ago_in_words(@submission.submitted_at)} ago (at #{@submission.submitted_at.to_formatted_s(:long)})
+        %tr
+          %td.text-right
+            %strong Graded
+          - if @submission.graded_at
+            %td #{time_ago_in_words(@submission.graded_at)} ago (at #{@submission.graded_at.to_formatted_s(:long)})
+          - else
+            %td -
+        %tr
+          %td.text-right
+            %strong Points
+          %td #{@submission.points}/#{@submission.problem.full_score}
+        %tr
+          %td.text-right
+            %strong Comment
+          %td #{@submission.grader_comment}
+        %tr
+          %td.text-right
+            %strong Runtime (s)
+          %td #{@submission.max_runtime}
+        %tr
+          %td.text-right
+            %strong Memory (kb)
+          %td #{@submission.peak_memory}
+        - if session[:admin]
+          %tr
+            %td.text-right
+              %strong IP
+            %td #{@submission.ip_address}