diff --git a/manage.py b/manage.py
index af25a95..8da7130 100644
--- a/manage.py
+++ b/manage.py
@@ -138,7 +138,7 @@ def manageProcess(fCommand, fData):
                                          cclass['class_id'] in tmpAbsData[currDate][p]['signature']),
                             "absent": False if not num in tmpAbsData[currDate][p] else tmpAbsData[currDate][p][num]
                         }
-        return render_template('group_teach.html', cclass=cclass, absData=absData, dow=dow, currDate=currDate, tmpAbsData=tmpAbsData, confirmed=confirmed)
+        return render_template('group_teach.html', dateKeys=sorted(tmpAbsData.keys()), cclass=cclass, absData=absData, dow=dow, currDate=currDate, tmpAbsData=tmpAbsData, confirmed=confirmed)
     elif pl == 'homeroom':
         homeroom = session['homeroom'].split('^')
         homeroomData = db.child("Homerooms").child(homeroom[0]).child(
@@ -177,7 +177,7 @@ def manageProcess(fCommand, fData):
                 if i >= datetime.now(tz).strftime("%Y-%m-%d"):
                     break
         return render_template('homeroom.html', absData=absData, homeroomCode=homeroom, homeroomData=homeroomData,
-                               currDate=currDate, periods=['m', '1', '2', '3', '4', 'n', '5', '6', '7', '8', '9'], currPeriod=currPeriod)
+                               currDate=currDate, dateKeys=sorted(absData.keys()), periods=['m', '1', '2', '3', '4', 'n', '5', '6', '7', '8', '9'], currPeriod=currPeriod)
     else:
         return redirect('/logout')
 
diff --git a/templates/admin.html b/templates/admin.html
index f3ddb41..fe7646e 100644
--- a/templates/admin.html
+++ b/templates/admin.html
@@ -34,13 +34,6 @@
         <h2 style="color: red; text-align: center;">Homeroom NOT Confirmed 班導尚未確認</h2>
         {% endif %}
         <a href="/logout"><button class="btn btn-primary logout margin-top">Logout 登出</button></a>
-        <form action="/swapClass" method="post" id="swapClassForm" hidden>
-            <input type="text" name="homeroom" value="{{homeroomCode[0]}}^{{homeroomCode[1]}}">
-            <input type="text" name="date" value="{{currDate}}">
-            <input type="text" name="type" value="seewindow">
-        </form>
-        <a href="/swapClass/{{homeroomCode[0]}}/{{homeroomCode[1]}}/{{currDate}}"><button
-                class="btn btn-warning logout margin-top">Swap Classes 改、換課</button></a>
         <div class="container margin-bottom">
             <div class="row">
                 <div class="col">
@@ -60,7 +53,7 @@
                     <select name="date" id="date" class="form-select">
                         {% for date in absData %}
                         {% if date == currDate %}
-                        <option value="{{date}}" selected="selected">{{date}}</option>
+                        <option value="{{date}}" selected="selected">{{date}} ★</option>
                         {% else %}
                         <option value="{{date}}">{{date}}</option>
                         {% endif %}
diff --git a/templates/group_teach.html b/templates/group_teach.html
index d83f979..377128f 100644
--- a/templates/group_teach.html
+++ b/templates/group_teach.html
@@ -31,13 +31,16 @@
         <a href="/logout"><button class="btn btn-primary margin-top logout">Logout 登出</button></a>
         <a href="/select"><button class="btn btn-primary margin-top logout">Choose Subuser 選擇其他帳號</button></a>
         <select name="date" id="date" class="form-select logout" onchange="chgDate();">
-            {% for date in tmpAbsData %}
-            {% if date == currDate %}
-            <option value="{{date}}" selected="selected">{{date}}</option>
-            {% else %}
-            <option value="{{date}}">{{date}}</option>
-            {% endif %}
-            {% endfor %}
+            {% for date in range(dateKeys|length) %}
+            {% if dateKeys[date] == currDate %}
+            {% if date-2 >= 0 %}<option value="{{dateKeys[date-2]}}">{{dateKeys[date-2]}}</option>{% endif %}
+            {% if date-1 >= 0 %}<option value="{{dateKeys[date-1]}}">{{dateKeys[date-1]}}</option>{% endif %}
+            <option value="{{dateKeys[date]}}" selected="selected">{{dateKeys[date]}} ★</option>
+            {% for i in range(1,5) %}
+            {% if date+i < dateKeys|length %}<option value="{{dateKeys[date+i]}}">{{dateKeys[date+i]}}</option>{%endif%}
+                {% endfor %}
+                {% endif %}
+                {% endfor %}
         </select>
         {% for i in absData %}
         {% set alr_fill = namespace(found=false) %}
diff --git a/templates/homeroom.html b/templates/homeroom.html
index c5d6034..a15c6a6 100644
--- a/templates/homeroom.html
+++ b/templates/homeroom.html
@@ -32,13 +32,16 @@
         <a href="/logout"><button class="btn btn-primary logout margin-top">Logout 登出</button></a>
         <a href="/select"><button class="btn btn-primary margin-top logout">Choose Subuser 選擇其他帳號</button></a>
         <select name="date" id="date" class="form-select logout" onchange="chgDate();">
-            {% for date in absData %}
-            {% if date == currDate %}
-            <option value="{{date}}" selected="selected">{{date}}</option>
-            {% else %}
-            <option value="{{date}}">{{date}}</option>
-            {% endif %}
-            {% endfor %}
+            {% for date in range(dateKeys|length) %}
+            {% if dateKeys[date] == currDate %}
+            {% if date-2 >= 0 %}<option value="{{dateKeys[date-2]}}">{{dateKeys[date-2]}}</option>{% endif %}
+            {% if date-1 >= 0 %}<option value="{{dateKeys[date-1]}}">{{dateKeys[date-1]}}</option>{% endif %}
+            <option value="{{dateKeys[date]}}" selected="selected">{{dateKeys[date]}} ★</option>
+            {% for i in range(1,5) %}
+            {% if date+i < dateKeys|length %}<option value="{{dateKeys[date+i]}}">{{dateKeys[date+i]}}</option>{%endif%}
+                {% endfor %}
+                {% endif %}
+                {% endfor %}
         </select>
         <form action="/manage/homeroom_confirm" id="homeroom_confirm" method="post">
             <input type="hidden" name="date" value="{{currDate}}">
diff --git a/templates/selSubUser.html b/templates/selSubUser.html
index 583e8e4..270d9ae 100644
--- a/templates/selSubUser.html
+++ b/templates/selSubUser.html
@@ -35,13 +35,13 @@
                 <option value="" selected>Please select</option>
                 {% for key in data %}
                 {% if data[key]['type'] == 'homeroom' %}
-                <option value="homeroom^{{data[key]['homeroom']}}">HR: {{data[key]['homeroom']}}
+                <option value="homeroom^{{data[key]['homeroom']}}">🏠 {{data[key]['homeroom']}}
                 </option>
                 {% else %}
                 {% for i in data[key] %}
                 {% if i == 'type' %}
                 {% else %}
-                <option value="group^{{i}}^{{data[key][i]}}">GP: {{i}}: {{data[key][i]}}</option>
+                <option value="group^{{i}}^{{data[key][i]}}">🧑‍🏫 {{i}}: {{data[key][i]}}</option>
                 {% endif %}
                 {% endfor %}
                 {% endif %}