diff --git a/app/views/submissions/show.html.haml b/app/views/submissions/show.html.haml
--- a/app/views/submissions/show.html.haml
+++ b/app/views/submissions/show.html.haml
@@ -6,6 +6,8 @@
 
 //%div.highlight{:style => "border: 1px solid black;"}
 //=@formatted_code.html_safe
+
+
 .containter
   .row
     .col-md-7
@@ -64,7 +66,7 @@
         %tr
           %td.text-right
             %strong Points
-          %td #{@submission.points}/#{@submission.problem.full_score}
+          %td #{@submission.points}/#{@submission.try(:problem).try(:full_score)}
         %tr
           %td.text-right
             %strong Comment
@@ -81,9 +83,30 @@
           %td.text-right
             %strong Compiler result
           %td
-            %pre= @submission.compiler_message
+            %button.btn.btn-info.btn-xs{type: 'button', data: {toggle: 'modal', target: '#compiler'}}
+              view
         - if session[:admin]
           %tr
             %td.text-right
               %strong IP
             %td #{@submission.ip_address}
+        %tr
+          %td.text-right
+            %strong Grading Task Status
+          %td
+            = @task.status_str if @task
+            - if session[:admin]
+              = link_to "rejudge", rejudge_submission_path, data: {remote: true}, class: 'btn btn-info btn-xs'
+
+
+.modal.fade#compiler{tabindex: -1,role: 'dialog'}
+  .modal-dialog.modal-lg{role:'document'}
+    .modal-content
+      .modal-header
+        %button.close{type: 'button', data: {dismissed: :modal}, aria: {label: 'close'}}
+          %span{aria: {hidden: 'true'}, data: {dismiss: 'modal'}} ×
+        %h4 Compiler message
+      .modal-body
+        %pre#compiler_msg= @submission.compiler_message
+      .modal-footer
+        %button.btn.btn-default{type: 'button', data: {dismiss: 'modal'}} Close