diff --git a/locale/vi/LC_MESSAGES/django.po b/locale/vi/LC_MESSAGES/django.po
index 800e099..a2cf140 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-11-19 03:12+0700\n"
+"POT-Creation-Date: 2022-11-19 07:11+0700\n"
 "PO-Revision-Date: 2021-07-20 03:44\n"
 "Last-Translator: Icyene\n"
 "Language-Team: Vietnamese\n"
@@ -87,7 +87,7 @@ msgid "Included contests"
 msgstr ""
 
 #: judge/admin/contest.py:74 judge/admin/volunteer.py:54
-#: templates/contest/clarification.html:42 templates/contest/contest.html:85
+#: templates/contest/clarification.html:42 templates/contest/contest.html:90
 #: templates/contest/moss.html:43 templates/internal/base.html:29
 #: templates/internal/base.html:37 templates/problem/list.html:15
 #: templates/problem/list.html:30 templates/problem/list.html:146
@@ -214,7 +214,7 @@ msgid "Taxonomy"
 msgstr ""
 
 #: judge/admin/problem.py:216 judge/admin/problem.py:434
-#: templates/contest/contest.html:86 templates/problem/data.html:475
+#: templates/contest/contest.html:91 templates/problem/data.html:475
 #: templates/problem/list.html:20 templates/problem/list.html:44
 #: templates/user/base-users-table.html:10 templates/user/user-about.html:36
 #: templates/user/user-about.html:52 templates/user/user-problems.html:58
@@ -463,7 +463,7 @@ msgstr ""
 msgid "ICPC"
 msgstr ""
 
-#: judge/contest_format/ioi.py:19
+#: judge/contest_format/ioi.py:20
 msgid "IOI"
 msgstr ""
 
@@ -780,8 +780,8 @@ msgid ""
 "Format hh:mm:ss. For example, if you want to freeze contest after 2 hours, "
 "enter 02:00:00"
 msgstr ""
-"Định dạng hh:mm:ss (giờ:phút:giây). Ví dụ, nếu muốn đóng băng kỳ thi sau 2h, hãy "
-"nhập 02:00:00"
+"Định dạng hh:mm:ss (giờ:phút:giây). Ví dụ, nếu muốn đóng băng kỳ thi sau 2h, "
+"hãy nhập 02:00:00"
 
 #: judge/models/contest.py:140 judge/models/problem.py:222
 msgid "publicly visible"
@@ -2942,7 +2942,7 @@ msgstr "Hướng dẫn cho {0}"
 msgid "Editorial for <a href=\"{1}\">{0}</a>"
 msgstr "Hướng dẫn cho <a href=\"{1}\">{0}</a>"
 
-#: judge/views/problem.py:447 templates/contest/contest.html:81
+#: judge/views/problem.py:447 templates/contest/contest.html:86
 #: templates/organization/org-left-sidebar.html:4
 #: templates/user/user-about.html:28 templates/user/user-bookmarks.html:32
 #: templates/user/user-tabs.html:5 templates/user/users-table.html:19
@@ -3980,17 +3980,25 @@ msgstr ""
 msgid "<b>%(length)s</b> long starting on <b>%(start_time)s</b>"
 msgstr "Kéo dài <b>%(length)s</b> bắt đầu từ <b>%(start_time)s</b>"
 
-#: templates/contest/contest.html:87
+#: templates/contest/contest.html:72
+msgid "Standing was frozen"
+msgstr "Bảng điểm đã đóng băng"
+
+#: templates/contest/contest.html:72
+msgid "at"
+msgstr "lúc"
+
+#: templates/contest/contest.html:92
 msgid "AC Rate"
 msgstr "Tỷ lệ AC"
 
-#: templates/contest/contest.html:88 templates/contest/list.html:242
+#: templates/contest/contest.html:93 templates/contest/list.html:242
 #: templates/contest/list.html:291 templates/contest/list.html:376
 #: templates/problem/list.html:21
 msgid "Users"
-msgstr "Số lượng"
+msgstr "Người nộp"
 
-#: templates/contest/contest.html:113 templates/problem/list.html:54
+#: templates/contest/contest.html:118 templates/problem/list.html:54
 #: templates/problem/list.html:126
 msgid "Editorial"
 msgstr "Hướng dẫn"
@@ -4141,6 +4149,11 @@ msgstr "Hủy kết quả"
 msgid "Fullname"
 msgstr "Tên đầy đủ"
 
+#: templates/contest/ranking-table.html:57 templates/user/edit-profile.html:103
+#: templates/user/import/table_csv.html:7
+msgid "School"
+msgstr "Trường"
+
 #: templates/contest/ranking.html:21
 msgid "Are you sure you want to disqualify this participation?"
 msgstr "Bạn có chắc muốn hủy kết quả này?"
@@ -4149,31 +4162,31 @@ msgstr "Bạn có chắc muốn hủy kết quả này?"
 msgid "Are you sure you want to un-disqualify this participation?"
 msgstr "Bạn có chắc muốn khôi phục kết quả này?"
 
-#: templates/contest/ranking.html:135
+#: templates/contest/ranking.html:136
 msgid "View user participation"
 msgstr "Xem các lần tham gia"
 
-#: templates/contest/ranking.html:139
-msgid "Show organizations"
-msgstr "Hiển thị tổ chức"
+#: templates/contest/ranking.html:140
+msgid "Show schools"
+msgstr "Hiển thị trường"
 
-#: templates/contest/ranking.html:143
+#: templates/contest/ranking.html:144
 msgid "Show full name"
 msgstr "Hiển thị họ tên"
 
-#: templates/contest/ranking.html:146
+#: templates/contest/ranking.html:147
 msgid "Show friends only"
 msgstr "Chỉ hiển thị bạn bè"
 
-#: templates/contest/ranking.html:149
+#: templates/contest/ranking.html:150
 msgid "Total score only"
 msgstr "Chỉ hiển thị tổng điểm"
 
-#: templates/contest/ranking.html:151
+#: templates/contest/ranking.html:152
 msgid "Show virtual participation"
 msgstr "Hiển thị tham gia ảo"
 
-#: templates/contest/ranking.html:155
+#: templates/contest/ranking.html:156
 msgid "Download as CSV"
 msgstr "Tải file CSV"
 
@@ -5505,10 +5518,6 @@ msgstr "Top Score"
 msgid "Rank"
 msgstr "Rank"
 
-#: templates/user/edit-profile.html:103 templates/user/import/table_csv.html:7
-msgid "School"
-msgstr "Trường"
-
 #: templates/user/edit-profile.html:109
 msgid "Self-description"
 msgstr "Tự giới thiệu"
@@ -5769,6 +5778,12 @@ msgstr "Thông tin"
 msgid "Check all"
 msgstr "Chọn tất cả"
 
+#~ msgid "Frozen"
+#~ msgstr "Đã đóng băng"
+
+#~ msgid "Show organizations"
+#~ msgstr "Hiển thị tổ chức"
+
 #~ msgid "Dislike"
 #~ msgstr "Không thích"
 
diff --git a/resources/contest.scss b/resources/contest.scss
index a4cdef2..246f48c 100644
--- a/resources/contest.scss
+++ b/resources/contest.scss
@@ -111,7 +111,7 @@
         }
     }
 
-    #time {
+    .time {
         text-align: center;
         display: block;
         color: rgb(85, 85, 85);
diff --git a/templates/contest/contest.html b/templates/contest/contest.html
index cb35c3e..91a49fa 100644
--- a/templates/contest/contest.html
+++ b/templates/contest/contest.html
@@ -56,7 +56,7 @@
                 {% endif %}
             {%- endif -%}
         </a>
-        <div id="time">
+        <div class="time">
             {% if contest.time_limit %}
                 {% trans trimmed start_time=contest.start_time|date(_("F j, Y, G:i T")), end_time=contest.end_time|date(_("F j, Y, G:i T")), time_limit=contest.time_limit|timedelta('localized-no-seconds') %}
                     <b>{{ time_limit }}</b> window between <b>{{ start_time }}</b> and <b>{{ end_time }}</b>
@@ -67,6 +67,11 @@
                 {% endtrans %}
             {% endif %}
         </div>
+        {% if contest.freeze_after and contest.freeze_after + contest.start_time < now %}
+            <div class="time" style="margin-top: 0.2em">
+                <b>{{_("Standing was frozen")}}</b> {{_("at")}} <b>{{ (contest.freeze_after + contest.start_time) | date(_("F j, Y, G:i T")) }}</b>
+            </div>
+        {% endif %}
     </div>
 
     <div class="content-description">
diff --git a/templates/contest/media-js.html b/templates/contest/media-js.html
index 0d0901c..9d12dec 100644
--- a/templates/contest/media-js.html
+++ b/templates/contest/media-js.html
@@ -58,7 +58,7 @@
 
     function renew_filter(need_update=true) {
         var checkboxes = [
-            '#show-organizations-checkbox',
+            '#show-schools-checkbox',
             '#show-fullnames-checkbox',
             '#show-total-score-checkbox',
         ];
@@ -171,8 +171,8 @@
             window.location.href = url.replace('__username__', $(this).val());
         });
 
-        $('#show-organizations-checkbox').click(function () {
-            $('.organization').toggle();
+        $('#show-schools-checkbox').click(function () {
+            $('.school').toggle();
         });
         $('#show-fullnames-checkbox').click(function () { 
             $('.fullname').toggle();
diff --git a/templates/contest/ranking-css.html b/templates/contest/ranking-css.html
index 54fd018..4f5b96d 100644
--- a/templates/contest/ranking-css.html
+++ b/templates/contest/ranking-css.html
@@ -36,7 +36,7 @@
     }
 
     .frozen {
-        background: #a5c5d9 !important;
+        background: lightskyblue !important;
     }
 
     .rank {
diff --git a/templates/contest/ranking-table.html b/templates/contest/ranking-table.html
index 8d4e07d..86f7570 100644
--- a/templates/contest/ranking-table.html
+++ b/templates/contest/ranking-table.html
@@ -20,9 +20,9 @@
             {{ user.user.first_name if user.user.first_name else ''}}
         </div>
     {% endif %}
-    {% if user.organization %}
-        <div class="organization" style="display: none"><a style="color: gray; font-weight: 600" href="{{ user.organization.get_absolute_url() }}">
-            {{- user.organization.short_name -}}
+    {% if user.user.last_name %}
+        <div class="school" style="display: none"><a style="color: gray; font-weight: 600">
+            {{- user.user.last_name -}}
         </a></div>
     {% endif %}
 {% endblock %}
@@ -54,6 +54,7 @@
 
 {% block before_point_head %}
     <th class="full-name" style="display:none;">{{ _('Fullname') }}</th>
+    <th class="school" style="display:none;">{{ _('School') }}</th>
     {% for problem in problems %}
         <th class="points header problem-score-col" title="{{ problem.problem.name }}"><a href="{{ url('problem_detail', problem.problem.code) }}">
             {{- contest.get_label_for_problem(loop.index0) }}
diff --git a/templates/contest/ranking.html b/templates/contest/ranking.html
index dda930a..fca0d9c 100644
--- a/templates/contest/ranking.html
+++ b/templates/contest/ranking.html
@@ -103,8 +103,9 @@
                         if ($col.hasClass('rating-column')) {
                             return;
                         } else if ($col.hasClass('user-name')) {
-                            row_data.push(clean_text($col.ignore('.fullname').ignore('.organization').text()));
-                            row_data.push(clean_text($col.ignore('.user').ignore('.organization').text()));
+                            row_data.push(clean_text($col.ignore('.fullname').ignore('.school').text()));
+                            row_data.push(clean_text($col.ignore('.user').ignore('.school').text()));
+                            row_data.push(clean_text($col.ignore('.user').ignore('.fullname').text()));
                         } else {
                             row_data.push(clean_text($col.ignore('.solving-time').text()));
                         }
@@ -135,8 +136,8 @@
                 <input id="search-contest" type="text" placeholder="{{ _('View user participation') }}">
             {% endif %}
         {% endif %}
-        <input id="show-organizations-checkbox" type="checkbox" style="vertical-align: bottom">
-        <label for="show-organizations-checkbox" style="vertical-align: bottom; margin-right: 1em;">{{ _('Show organizations') }}</label>
+        <input id="show-schools-checkbox" type="checkbox" style="vertical-align: bottom">
+        <label for="show-schools-checkbox" style="vertical-align: bottom; margin-right: 1em;">{{ _('Show schools') }}</label>
     
         <input id="show-fullnames-checkbox" type="checkbox" style="vertical-align: bottom">