diff --git a/locale/vi/LC_MESSAGES/django.po b/locale/vi/LC_MESSAGES/django.po
index 8afdc5c..abc4c90 100644
--- a/locale/vi/LC_MESSAGES/django.po
+++ b/locale/vi/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lqdoj2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-30 14:09+0700\n"
+"POT-Creation-Date: 2022-05-30 14:27+0700\n"
 "PO-Revision-Date: 2021-07-20 03:44\n"
 "Last-Translator: Icyene\n"
 "Language-Team: Vietnamese\n"
@@ -4277,8 +4277,8 @@ msgid "Controls"
 msgstr "Quản lý"
 
 #: templates/organization/org-right-sidebar.html:24
-msgid "Edit organization"
-msgstr "Chỉnh sửa"
+msgid "Edit group"
+msgstr "Chỉnh sửa nhóm"
 
 #: templates/organization/org-right-sidebar.html:31
 msgid "View requests"
@@ -5571,6 +5571,9 @@ msgstr "Thông tin"
 msgid "Check all"
 msgstr "Chọn tất cả"
 
+#~ msgid "Edit organization"
+#~ msgstr "Chỉnh sửa"
+
 #~ msgid "You may not be part of more than {count} public organizations."
 #~ msgstr "Bạn không thể tham gia nhiều hơn {count} tổ chức công khai."
 
diff --git a/templates/blog/content.html b/templates/blog/content.html
index 753e36e..32e1f32 100644
--- a/templates/blog/content.html
+++ b/templates/blog/content.html
@@ -7,8 +7,22 @@
                     <span class="post-authors">{{ link_users(authors) }}</span>
                 {%- endif -%}
             {% endwith %}
-            &#8226; {{ relative_time(post.publish_on, abs=_('on {time}'), rel=_('{time}')) -}}
-            {%- if post.sticky %} &#8226; <i title="Sticky" class="fa fa-star fa-fw"></i>{% endif -%}
+            &#8226;
+            {{ relative_time(post.publish_on, abs=_('on {time}'), rel=_('{time}')) -}}
+            {%- if post.sticky %} &#8226; 
+            <i title="Sticky" class="fa fa-star fa-fw"></i>{% endif -%}
+            {% if post.is_organization_private and show_organization_private_icon %}
+                &#8226;
+                <span>
+                    {% for org in post.organizations.all() %}
+                        <span class="organization-tag" style="display: inherit;">
+                            <a href="{{ org.get_absolute_url() }}">
+                                <i class="fa fa-lock"></i> {{ org.name }}
+                            </a>
+                        </span>
+                    {% endfor %}
+                </span>
+            {% endif %}
         </span>
         <span style="float: right">
             <a href="{{ url('blog_post', post.id, post.slug) }}#comments" class="blog-comment-count-link">
@@ -22,17 +36,6 @@
     <h2 class="title">
         <a href="{{ url('blog_post', post.id, post.slug) }}">{{ post.title }}</a>
     </h2>
-    {% if post.is_organization_private and show_organization_private_icon %}
-        <div class="organization-tags">
-            {% for org in post.organizations.all() %}
-                <span class="organization-tag">
-                    <a href="{{ org.get_absolute_url() }}">
-                        <i class="fa fa-lock"></i> {{ org.name }}
-                    </a>
-                </span>
-            {% endfor %}
-        </div>
-    {% endif %}
     <div class="summary content-description blog-description">
         {% cache 86400 'post_summary' post.id %}
             {{ post.summary|default(post.content, true)|markdown('blog', 'svg', lazy_load=True)|reference|str|safe }}
diff --git a/templates/organization/org-right-sidebar.html b/templates/organization/org-right-sidebar.html
index 55cecae..fe556cb 100644
--- a/templates/organization/org-right-sidebar.html
+++ b/templates/organization/org-right-sidebar.html
@@ -21,7 +21,7 @@
                 {% if can_edit %}
                     <li>
                         <div>
-                            <a href="{{ url('edit_organization', organization.id, organization.slug) }}">{{ _('Edit organization') }}</a>
+                            <a href="{{ url('edit_organization', organization.id, organization.slug) }}">{{ _('Edit group') }}</a>
                         </div>
                     </li>
                 {% endif %}