diff --git a/resources/blog.scss b/resources/blog.scss
index 0e616d5..c720ad4 100644
--- a/resources/blog.scss
+++ b/resources/blog.scss
@@ -259,6 +259,10 @@
 
 
 @media (max-width: 799px) {
+    .actionbar-box {
+        margin: 8px 0;
+    }
+
     .left-sidebar-header {
         display: none;
     }
@@ -284,6 +288,7 @@
     .blog-box {
         padding-left: 5%;
         padding-right: 5%;
+        margin-bottom: 0;
     }
 
     .post-title {
diff --git a/templates/actionbar/list.html b/templates/actionbar/list.html
index e5761bb..ea046a4 100644
--- a/templates/actionbar/list.html
+++ b/templates/actionbar/list.html
@@ -1,54 +1,54 @@
 {% set logged_in = request.user.is_authenticated %}
 {% set profile = request.profile if logged_in else None %}
 {% if logged_in %}
-{% if include_hr %}
-<hr>{% endif %}
-<div class="page-vote actionbar">
-  <span class="actionbar-block" style="justify-content: flex-start;">
-    <span id="like-button-{{pagevote.id}}"
-      class="like-button actionbar-button {% if pagevote.vote_score(request.profile) == 1 %}voted{% endif %}"
-      onclick="javascript:pagevote_upvote({{ pagevote.id }})">
-      <span class="pagevote-score" id="pagevote-score-{{pagevote.id}}">{{ pagevote.score }}</span>
-      <i class="fa fa-thumbs-o-up" style="font-size: large;"></i>
-      <span class="actionbar-text">{{_("Like")}}</span>
+  {% if include_hr %}
+    <hr>{% endif %}
+  <div class="page-vote actionbar">
+    <span class="actionbar-block" style="justify-content: flex-start;">
+      <span id="like-button-{{pagevote.id}}"
+        class="like-button actionbar-button {% if pagevote.vote_score(request.profile) == 1 %}voted{% endif %}"
+        onclick="javascript:pagevote_upvote({{ pagevote.id }}, event)">
+        <span class="pagevote-score" id="pagevote-score-{{pagevote.id}}">{{ pagevote.score }}</span>
+        <i class="fa fa-thumbs-o-up" style="font-size: large;"></i>
+        <span class="actionbar-text">{{_("Like")}}</span>
+      </span>
+      <span id="dislike-button-{{pagevote.id}}"
+        class="dislike-button actionbar-button {% if pagevote.vote_score(request.profile) == -1 %}voted{% endif %}"
+        onclick="javascript:pagevote_downvote({{ pagevote.id }}, event)">
+        <i class="fa fa-thumbs-o-down" style="font-size: large;"></i>
+      </span>
     </span>
-    <span id="dislike-button-{{pagevote.id}}"
-      class="dislike-button actionbar-button {% if pagevote.vote_score(request.profile) == -1 %}voted{% endif %}"
-      onclick="javascript:pagevote_downvote({{ pagevote.id }})">
-      <i class="fa fa-thumbs-o-down" style="font-size: large;"></i>
-    </span>
-  </span>
-  {% if not hide_actionbar_comment %}
-  <span class="actionbar-block">
-    <span class="actionbar-button actionbar-comment">
-      <i class="fa fa-comment-o" style="font-size: large;"></i>
-      <span class="actionbar-text">{{_("Comment")}} {% if comment_list.count() %} ({{comment_list.count()}}) {% endif
-        %}</span>
-    </span>
-  </span>
-  {% endif %}
-  <span class="actionbar-block">
-    <span id="bookmark-button-{{bookmark.id}}"
-      class="bookmark-button actionbar-button {% if bookmark.get_bookmark(request.profile) == True %} bookmarked {% endif %}"
-      onclick="javascript:bookmark({{ bookmark.id }})">
-      <i class="fa fa-bookmark-o" style="font-size: large;"></i>
-      <span class="actionbar-text">{{_("Bookmark")}}</span>
-    </span>
-  </span>
-  <span class="actionbar-block" style="justify-content: flex-end;">
-    <span class="actionbar-button actionbar-share" style="position: relative"
-      {{"share-url=" + share_url if share_url else ""}}>
-        <i class=" fa fa-share" style="font-size: large;"></i>
-      <span class="actionbar-text">{{_("Share")}}</span>
-    </span>
-  </span>
-  {% if actionbar_report_url %}
-  <span class="actionbar-block">
-    <a class="actionbar-button black" href="{{actionbar_report_url}}">
-      <i class="fa fa-flag-o" style="font-size: large;"></i>
-      <span class="actionbar-text">{{_("Report")}}</span>
-    </a>
-  </span>
-  {% endif %}
-</div>
-{% endif %}
\ No newline at end of file
+    {% if not hide_actionbar_comment %}
+      <span class="actionbar-block">
+        <span class="actionbar-button actionbar-comment">
+          <i class="fa fa-comment-o" style="font-size: large;"></i>
+          <span class="actionbar-text">{{_("Comment")}} {% if comment_list.count() %} ({{comment_list.count()}}) {% endif
+            %}</span>
+            </span>
+            </span>
+          {% endif %}
+            <span class="actionbar-block">
+              <span id="bookmark-button-{{bookmark.id}}"
+                class="bookmark-button actionbar-button {% if bookmark.get_bookmark(request.profile) == True %} bookmarked {% endif %}"
+                onclick="javascript:bookmark({{ bookmark.id }}, event)">
+                <i class="fa fa-bookmark-o" style="font-size: large;"></i>
+                <span class="actionbar-text">{{_("Bookmark")}}</span>
+              </span>
+            </span>
+            <span class="actionbar-block" style="justify-content: flex-end;">
+              <span class="actionbar-button actionbar-share" style="position: relative"
+                {{"share-url=" + share_url if share_url else ""}}>
+                <i class=" fa fa-share" style="font-size: large;"></i>
+                <span class="actionbar-text">{{_("Share")}}</span>
+              </span>
+            </span>
+            {% if actionbar_report_url %}
+              <span class="actionbar-block">
+                <a class="actionbar-button black" href="{{actionbar_report_url}}">
+                  <i class="fa fa-flag-o" style="font-size: large;"></i>
+                  <span class="actionbar-text">{{_("Report")}}</span>
+                </a>
+              </span>
+            {% endif %}
+          </div>
+    {% endif %}
\ No newline at end of file
diff --git a/templates/actionbar/media-css.html b/templates/actionbar/media-css.html
deleted file mode 100644
index 0ad2a51..0000000
--- a/templates/actionbar/media-css.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<style>
-  @media (max-width: 799px) {
-    .actionbar-text {
-      display: none;
-    }
-  }
-</style>
diff --git a/templates/actionbar/media-js.html b/templates/actionbar/media-js.html
index c3b7e0d..e775fa3 100644
--- a/templates/actionbar/media-js.html
+++ b/templates/actionbar/media-js.html
@@ -37,7 +37,8 @@
         });
       }
 
-      window.bookmark = function(id) {
+      window.bookmark = function(id, e) {
+        e.stopPropagation();
         var $bookmark = $('#bookmark-button-' + id);
         if ($bookmark.hasClass('bookmarked')) {
           ajax_bookmark('{{ url('undobookmark') }}', id, function () {
@@ -61,7 +62,8 @@
         };
       };
 
-      window.pagevote_upvote = function (id) {
+      window.pagevote_upvote = function (id, e) {
+        e.stopPropagation();
         var $votes = get_$votes(id);
         if ($votes.upvote.hasClass('voted')) {
           ajax_vote('{{ url('pagevote_downvote') }}', id, -1, function () {
@@ -83,7 +85,8 @@
         }
       };
 
-      window.pagevote_downvote = function (id) {
+      window.pagevote_downvote = function (id, e) {
+        e.stopPropagation();
         var $votes = get_$votes(id);
         if ($votes.downvote.hasClass('voted')) {
           ajax_vote('{{ url('pagevote_upvote') }}', id, 1, function () {
@@ -104,7 +107,8 @@
           }
         }
       };
-      $(".actionbar-share").click( function() {
+      $(".actionbar-share").click(function(e) {
+        e.stopPropagation();
         link = $(this).attr("share-url") || window.location.href;
         navigator.clipboard
           .writeText(link)
diff --git a/templates/blog/blog.html b/templates/blog/blog.html
index fa97dac..59d4e3d 100644
--- a/templates/blog/blog.html
+++ b/templates/blog/blog.html
@@ -7,7 +7,6 @@
 
 {% block media %}
   {% include "comments/media-css.html" %}
-  {% include "actionbar/media-css.html" %}
 {% endblock %}
 
 {% block title_row %}
diff --git a/templates/blog/list.html b/templates/blog/list.html
index 8d18b56..270d532 100644
--- a/templates/blog/list.html
+++ b/templates/blog/list.html
@@ -1,7 +1,6 @@
 {% extends "three-column-content.html" %}
 {% block three_col_media %}
   {% include "blog/media-css.html" %}
-  {% include "actionbar/media-css.html" %}
   <style>
     @media (max-width: 799px) {
       .title {
diff --git a/templates/contest/contest.html b/templates/contest/contest.html
index 37c2985..9e12283 100644
--- a/templates/contest/contest.html
+++ b/templates/contest/contest.html
@@ -18,7 +18,6 @@
 
 {% block two_col_media %}
   {% include "comments/media-css.html" %}
-  {% include "actionbar/media-css.html" %}
 {% endblock %}
 
 {% block middle_content %}
diff --git a/templates/organization/home.html b/templates/organization/home.html
index 2c7c712..bebfc73 100644
--- a/templates/organization/home.html
+++ b/templates/organization/home.html
@@ -6,10 +6,6 @@
   {% include "actionbar/media-js.html" %}
 {% endblock %}
 
-{% block three_col_media %}
-  {% include "actionbar/media-css.html" %}
-{% endblock %}
-
 {% block middle_title %}
   <div class="page-title">
     <div class="tabs" style="border: none;">
diff --git a/templates/problem/editorial.html b/templates/problem/editorial.html
index d942b8e..d36801d 100644
--- a/templates/problem/editorial.html
+++ b/templates/problem/editorial.html
@@ -7,7 +7,6 @@
 
 {% block content_media %}
   {% include "comments/media-css.html" %}
-  {% include "actionbar/media-css.html" %}
 {% endblock %}
 
 {% block header %}
diff --git a/templates/problem/feed.html b/templates/problem/feed.html
index d28868f..c349664 100644
--- a/templates/problem/feed.html
+++ b/templates/problem/feed.html
@@ -1,150 +1,150 @@
 {% extends "problem/list-base.html" %}
 {% block left_sidebar %}
-{% include "problem/left-sidebar.html" %}
+  {% include "problem/left-sidebar.html" %}
 {% endblock %}
 
 {% block middle_content %}
-<div class="problem-feed-option">
-  <a href="{{url('problem_feed')}}"
-    class="button small  {{'btn-midnightblue' if feed_type=='for_you' else 'btn-gray'}}">
-    {{_('FOR YOU')}}
-  </a>
-  <a href="{{url('problem_feed_new')}}" class="button small {{'btn-midnightblue' if feed_type=='new' else 'btn-gray'}}">
-    {{_('NEW')}}
-  </a>
-  {% if request.user.has_perm('judge.suggest_problem_changes') %}
-  <a href="{{url('problem_feed_volunteer')}}"
-    class="button small {{'btn-midnightblue' if feed_type=='volunteer' else 'btn-gray'}}">
-    {{_('VOLUNTEER')}}
-  </a>
-  {% endif %}
-</div>
-{% if request.user.has_perm('judge.suggest_problem_changes') and feed_type == 'volunteer' %}
-<ul style="margin-bottom: 1em; margin-left: auto">
-  <li><a href="{{url('admin:judge_volunteerproblemvote_changelist')}}">{{_('View your votes')}}</a></li>
-</ul>
-{% endif %}
-{% for problem in problems %}
-<div class="blog-box">
-  <h3 class="problem-feed-name">
-    <a href="{{ url('problem_detail', problem.code) }}">
-      {{ problem.i18n_name }}
+  <div class="problem-feed-option">
+    <a href="{{url('problem_feed')}}"
+      class="button small {{'btn-midnightblue' if feed_type=='for_you' else 'btn-gray'}}">
+      {{_('FOR YOU')}}
     </a>
-    {% if problem.id in completed_problem_ids %}
-    <i class="solved-problem-color fa fa-check-circle"></i>
-    {% elif problem.id in attempted_problems %}
-    <i class="attempted-problem-color fa fa-minus-circle"></i>
-    {% else %}
-    <i class="unsolved-problem-color fa fa-minus-circle"></i>
+    <a href="{{url('problem_feed_new')}}" class="button small {{'btn-midnightblue' if feed_type=='new' else 'btn-gray'}}">
+      {{_('NEW')}}
+    </a>
+    {% if request.user.has_perm('judge.suggest_problem_changes') %}
+      <a href="{{url('problem_feed_volunteer')}}"
+        class="button small {{'btn-midnightblue' if feed_type=='volunteer' else 'btn-gray'}}">
+        {{_('VOLUNTEER')}}
+      </a>
     {% endif %}
-  </h3>
-  {% with authors=problem.authors.all() %}
-  {% if authors %}
-  <div class="problem-feed-info-entry">
-    <i class="fa fa-pencil-square-o fa-fw"></i>
-    <span class="pi-value">{{ link_users(authors) }}</span>
   </div>
+  {% if request.user.has_perm('judge.suggest_problem_changes') and feed_type == 'volunteer' %}
+    <ul style="margin-bottom: 1em; margin-left: auto">
+      <li><a href="{{url('admin:judge_volunteerproblemvote_changelist')}}">{{_('View your votes')}}</a></li>
+    </ul>
   {% endif %}
-  {% endwith %}
-  {% if show_types %}
-  <div class="problem-feed-types">
-    <i class="fa fa-tag"></i>
-    {% for type in problem.types_list %}
-    <span class="type-tag">{{ type }}</span>{% if not loop.last %}, {% endif %}
-    {% endfor %}, *{{problem.points | int}}
-  </div>
-  {% endif %}
-  <div class="blog-description">
-    <div class='content-description'>
-      {% cache 86400 'problem_html' problem.id MATH_ENGINE LANGUAGE_CODE %}
-      {{ problem.description|markdown(lazy_load=True)|reference|str|safe }}
-      {% endcache %}
-      {% if problem.pdf_description %}
-      <embed src="{{url('problem_pdf_description', problem.code)}}" width="100%" height="500" type="application/pdf"
-        style="margin-top: 0.5em">
+  {% for problem in problems %}
+    <div class="blog-box">
+      <h3 class="problem-feed-name">
+        <a href="{{ url('problem_detail', problem.code) }}">
+          {{ problem.i18n_name }}
+        </a>
+        {% if problem.id in completed_problem_ids %}
+          <i class="solved-problem-color fa fa-check-circle"></i>
+        {% elif problem.id in attempted_problems %}
+          <i class="attempted-problem-color fa fa-minus-circle"></i>
+        {% else %}
+          <i class="unsolved-problem-color fa fa-minus-circle"></i>
+        {% endif %}
+      </h3>
+      {% with authors=problem.authors.all() %}
+        {% if authors %}
+          <div class="problem-feed-info-entry">
+            <i class="fa fa-pencil-square-o fa-fw"></i>
+            <span class="pi-value">{{ link_users(authors) }}</span>
+          </div>
+        {% endif %}
+      {% endwith %}
+      {% if show_types %}
+        <div class="problem-feed-types">
+          <i class="fa fa-tag"></i>
+          {% for type in problem.types_list %}
+            <span class="type-tag">{{ type }}</span>{% if not loop.last %}, {% endif %}
+          {% endfor %}, *{{problem.points | int}}
+        </div>
       {% endif %}
+      <div class="blog-description">
+        <div class='content-description'>
+          {% cache 86400 'problem_html' problem.id MATH_ENGINE LANGUAGE_CODE %}
+            {{ problem.description|markdown(lazy_load=True)|reference|str|safe }}
+          {% endcache %}
+          {% if problem.pdf_description %}
+            <embed src="{{url('problem_pdf_description', problem.code)}}" width="100%" height="500" type="application/pdf"
+              style="margin-top: 0.5em">
+          {% endif %}
+        </div>
+        {% if feed_type=='volunteer' and request.user.has_perm('judge.suggest_problem_changes') %}
+          <br>
+          <a href="#" class="view-statement-src">{{ _('View source') }}</a>
+          <pre class="statement-src" style="display: none">{{ problem.description|str }}</pre>
+          <hr>
+          <center>
+            <h3>{{_('Volunteer form')}}</h3>
+          </center>
+          <br>
+          <button class="edit-btn" id="edit-{{problem.id}}" pid="{{problem.id}}" style="float: right">{{_('Edit')}}</button>
+          <form class="volunteer-form" id="form-{{problem.id}}" pid="{{problem.id}}" style="display: none;" method="POST">
+            <input type="submit" class="volunteer-submit-btn" id="submit-{{problem.id}}" pid="{{problem.id}}"
+              pcode="{{problem.code}}" style="float: right" value="{{_('Submit')}}">
+            <table class="table">
+              <thead>
+                <tr>
+                  <th>
+                  </th>
+                  <th>
+                    {{_('Value')}}
+                  </th>
+                </tr>
+              </thead>
+              <tbody>
+                <tr>
+                  <td width="30%">
+                    <label for="knowledge_point-{{problem.id}}"><i>{{ _('Knowledge point') }}</i></label>
+                  </td>
+                  <td>
+                    <input id="knowledge_point-{{problem.id}}" type="number" class="point-input" required>
+                  </td>
+                </tr>
+                <tr>
+                  <td width="30%">
+                    <label for="thinking_point-{{problem.id}}"><i>{{ _('Thinking point') }}</i></label>
+                  </td>
+                  <td>
+                    <input id="thinking_point-{{problem.id}}" type="number" class="point-input" required>
+                  </td>
+                </tr>
+                <tr>
+                  <td width="30%">
+                    <label for="types"><i>{{ _('Problem types') }}</i></label>
+                  </td>
+                  <td>
+                    <select id="volunteer-types-{{problem.id}}" name="types" multiple>
+                      {% for type in problem_types %}
+                        <option value="{{ type.id }}" {% if type in problem.types.all() %} selected{% endif %}>
+                          {{ type.full_name }}
+                        </option>
+                      {% endfor %}
+                    </select>
+                  </td>
+                </tr>
+                <tr>
+                  <td width="30%">
+                    <label for="feedback"><i>{{ _('Feedback') }}</i></label>
+                  </td>
+                  <td>
+                    <textarea id="feedback-{{problem.id}}" rows="2" style="width: 100%"
+                      placeholder="{{_('Any additional note here')}}"></textarea>
+                  </td>
+                </tr>
+              </tbody>
+            </table>
+          </form>
+          <center id="thank-{{problem.id}}" style="display: none; margin-top: 3em"></center>
+        {% endif %}
+        <div class="show-more"> {{_("...More")}} </div>
+      </div>
+      <div class="actionbar-box">
+        {% set pagevote = problem.pagevote %}
+        {% set bookmark = problem.bookmark %}
+        {% set hide_actionbar_comment = True %}
+        {% set include_hr = False %}
+        {% set share_url = request.build_absolute_uri(problem.get_absolute_url()) %}
+        {% include "actionbar/list.html" %}
+      </div>
     </div>
-    {% if feed_type=='volunteer' and request.user.has_perm('judge.suggest_problem_changes') %}
-    <br>
-    <a href="#" class="view-statement-src">{{ _('View source') }}</a>
-    <pre class="statement-src" style="display: none">{{ problem.description|str }}</pre>
-    <hr>
-    <center>
-      <h3>{{_('Volunteer form')}}</h3>
-    </center>
-    <br>
-    <button class="edit-btn" id="edit-{{problem.id}}" pid="{{problem.id}}" style="float: right">{{_('Edit')}}</button>
-    <form class="volunteer-form" id="form-{{problem.id}}" pid="{{problem.id}}" style="display: none;" method="POST">
-      <input type="submit" class="volunteer-submit-btn" id="submit-{{problem.id}}" pid="{{problem.id}}"
-        pcode="{{problem.code}}" style="float: right" value="{{_('Submit')}}">
-      <table class="table">
-        <thead>
-          <tr>
-            <th>
-            </th>
-            <th>
-              {{_('Value')}}
-            </th>
-          </tr>
-        </thead>
-        <tbody>
-          <tr>
-            <td width="30%">
-              <label for="knowledge_point-{{problem.id}}"><i>{{ _('Knowledge point') }}</i></label>
-            </td>
-            <td>
-              <input id="knowledge_point-{{problem.id}}" type="number" class="point-input" required>
-            </td>
-          </tr>
-          <tr>
-            <td width="30%">
-              <label for="thinking_point-{{problem.id}}"><i>{{ _('Thinking point') }}</i></label>
-            </td>
-            <td>
-              <input id="thinking_point-{{problem.id}}" type="number" class="point-input" required>
-            </td>
-          </tr>
-          <tr>
-            <td width="30%">
-              <label for="types"><i>{{ _('Problem types') }}</i></label>
-            </td>
-            <td>
-              <select id="volunteer-types-{{problem.id}}" name="types" multiple>
-                {% for type in problem_types %}
-                <option value="{{ type.id }}" {% if type in problem.types.all() %} selected{% endif %}>
-                  {{ type.full_name }}
-                </option>
-                {% endfor %}
-              </select>
-            </td>
-          </tr>
-          <tr>
-            <td width="30%">
-              <label for="feedback"><i>{{ _('Feedback') }}</i></label>
-            </td>
-            <td>
-              <textarea id="feedback-{{problem.id}}" rows="2" style="width: 100%"
-                placeholder="{{_('Any additional note here')}}"></textarea>
-            </td>
-          </tr>
-        </tbody>
-      </table>
-    </form>
-    <center id="thank-{{problem.id}}" style="display: none; margin-top: 3em"></center>
-    {% endif %}
-    <div class="show-more"> {{_("...More")}} </div>
-  </div>
-  <div class="actionbar-box">
-    {% set pagevote = problem.pagevote %}
-    {% set bookmark = problem.bookmark %}
-    {% set hide_actionbar_comment = True %}
-    {% set include_hr = False %}
-    {% set share_url = request.build_absolute_uri(problem.get_absolute_url()) %}
-    {% include "actionbar/list.html" %}
-  </div>
-</div>
-{% endfor %}
-{% if page_obj.num_pages > 1 %}
-<div style="margin-top:10px;">{% include "list-pages.html" %}</div>
-{% endif %}
+  {% endfor %}
+  {% if page_obj.num_pages > 1 %}
+    <div style="margin-top:10px;">{% include "list-pages.html" %}</div>
+  {% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/templates/problem/list-base.html b/templates/problem/list-base.html
index eacf581..02ec944 100644
--- a/templates/problem/list-base.html
+++ b/templates/problem/list-base.html
@@ -51,7 +51,6 @@
       }
     </style>
   {% endif %}
-  {% include "actionbar/media-css.html" %}
 {% endblock %}
 
 {% block three_col_js %}
diff --git a/templates/problem/problem.html b/templates/problem/problem.html
index 97003a0..29c923d 100644
--- a/templates/problem/problem.html
+++ b/templates/problem/problem.html
@@ -1,7 +1,6 @@
 {% extends "common-content.html" %}
 {% block content_media %}
   {% include "comments/media-css.html" %}
-  {% include "actionbar/media-css.html" %}
   <style>
     .title-state {
       font-size: 2em;