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
@@ -6,7 +6,7 @@
     = link_to_description_if_any "[#{t 'main.problem_desc'}] <span class='glyphicon glyphicon-file'></span>".html_safe, problem
   %td
     = @prob_submissions[problem.id][:count]
-    = link_to "[#{t 'main.submissions_link'}]", main_submission_path(problem.id)
+    = link_to "[subs]", main_submission_path(problem.id)
   %td
     = render :partial => 'submission_short',
       :locals => {:submission => @prob_submissions[problem.id][:submission], :problem_name => problem.name }
diff --git a/app/views/main/_submission_box.html.haml b/app/views/main/_submission_box.html.haml
--- a/app/views/main/_submission_box.html.haml
+++ b/app/views/main/_submission_box.html.haml
@@ -1,4 +1,4 @@
-= form_tag({:action => 'submit'}, :multipart => true, class: 'form-inline') do
+= form_tag({:action => 'submit'}, :multipart => true, class: 'form') do
   - if @submission and @submission.errors.any?
     #error_explanation
       .alert.alert-danger
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
@@ -3,47 +3,51 @@
 
 = user_title_bar(@user)
 
-.panel.panel-info
-  .panel-heading
-    Announcement
-  %ul.list-group
-    = render :partial => 'announcement', :collection => @announcements
-
-
-- if GraderConfiguration.show_submitbox_to?(@user)
-  .submitbox
-    = render :partial => 'submission_box'
-
-%hr/
-
 - if (GraderConfiguration.contest_mode?) and (@user.site!=nil) and (@user.site.started!=true)
   %p=t 'main.start_soon'
 
-- if GraderConfiguration.show_tasks_to?(@user)
-  - if not GraderConfiguration.multicontests?
-    %table.table.table-striped.table-condensed
-      %thead
-        %tr
-          %th Task name
-          %th Full name
-          %th # of sub(s)
-          %th Results
-          %th
-      %tbody
-        = render :partial => 'problem', :collection => @problems
-  - else
-    - @contest_problems.each do |cp|
-      - if cp[:problems].length > 0
-        %h2{:class =>'contest-title'}
-          = "#{cp[:contest] ? cp[:contest].title : 'Public problems'}"
-        %table.info
-          %tr.info-head
-            %th Task name
-            %th Full name
-            %th # of sub(s)
-            %th Results
-            %th
-          = render :partial => 'problem', :collection => cp[:problems]
+.row
+  .col-md-7
+    - if GraderConfiguration.show_submitbox_to?(@user)
+      .submitbox
+        = render :partial => 'submission_box'
+    - if GraderConfiguration.show_tasks_to?(@user)
+      - if not GraderConfiguration.multicontests?
+        %table.table.table-striped.table-condensed
+          %thead
+            %tr
+              %th Task name
+              %th Full name
+              %th # of sub(s)
+              %th Results
+              %th
+          %tbody
+            = render :partial => 'problem', :collection => @problems
+      - else
+        - @contest_problems.each do |cp|
+          - if cp[:problems].length > 0
+            %h2{:class =>'contest-title'}
+              = "#{cp[:contest] ? cp[:contest].title : 'Public problems'}"
+            %table.info
+              %tr.info-head
+                %th Task name
+                %th Full name
+                %th # of sub(s)
+                %th Results
+                %th
+              = render :partial => 'problem', :collection => cp[:problems]
+  .col-md-5
+    .panel.panel-info
+      .panel-heading
+        Announcement
+      %ul.list-group
+        = render :partial => 'announcement', :collection => @announcements
+
+
+
+%hr/
+
+
 
 %hr/