diff --git a/dislocker_auth.py b/dislocker_auth.py
index 1930f35..b5139bd 100644
--- a/dislocker_auth.py
+++ b/dislocker_auth.py
@@ -494,19 +494,19 @@ def admin():
 
 @app.route('/admin/pc_list')
 def admin_pclist():
-    table = '<table><thead><tr><th>PC番号</th><th>ニックネーム</th><th>マスターパスワード</th></tr></thead><tbody>'
+    table = '<table id="pc_list_table"><thead><tr><th>PC番号</th><th>ニックネーム</th><th>マスターパスワード</th></tr></thead><tbody>'
     pc_list = auth.get_pc_list()
     for i in pc_list:
         pc_number = i[0]
         alt_name = i[1]
         if alt_name == None:
-            alt_name = '--未登録--'
+            alt_name = '-ニックネーム未登録-'
 
         master_password = i[2]
         if master_password == None:
-            master_password = '--未登録--'
-
-        table += f'<tr><td>{pc_number}</td><td>{alt_name}</td><td>{master_password}</td></tr>'
+            pass
+        else:
+            table += f'<tr><td>{pc_number}</td><td>{alt_name}</td><td>{master_password}</td></tr>'
     
     table += '</tbody></table>'
 
diff --git a/resource/css/admin.css b/resource/css/admin.css
index 25865dd..8d2538a 100644
--- a/resource/css/admin.css
+++ b/resource/css/admin.css
@@ -1,5 +1,4 @@
 #sidebar {
-
     height: 100%;
     width: 30%;
     background-color: aliceblue;
@@ -10,4 +9,23 @@
 #general {
     display: flex;
     float: left;
+}
+
+#pc_list_table {
+    width: 50%;
+    table-layout: fixed;
+    border-collapse: collapse;
+    border: 2px solid;
+}
+
+th {
+    padding: 2px;
+    border-collapse: collapse;
+    border: 2px solid;
+}
+  
+td {
+    padding: 8px;
+    border-collapse: collapse;
+    border: 2px solid;
 }
\ No newline at end of file
diff --git a/templates/pc_list.html b/templates/pc_list.html
index d319eba..ae4432a 100644
--- a/templates/pc_list.html
+++ b/templates/pc_list.html
@@ -16,6 +16,7 @@
 
             <div id="main">
                 <h1>PCリストあるよ(笑)</h1>
+                <h2>登録されたPCのみが表示されています。</h2>
                 {{pc_list_table | safe}}
             </div>
         </div>