diff --git a/comm/server/static/css/pynq-manager.css b/comm/server/static/css/pynq-manager.css
index 72f5dc78a1e14d5d59bb69adf29bb5575b154148..d4e326cc6b9b50057c44888b7d02978af3e84dbb 100644
--- a/comm/server/static/css/pynq-manager.css
+++ b/comm/server/static/css/pynq-manager.css
@@ -1,6 +1,4 @@
 html, body{
-    /*width: 800px;*/
-    /*height: 500px;*/
     font-size: 11px;
     overflow: hidden;
 }
@@ -10,7 +8,7 @@ body{
 
 /* scrollbar settings */
 ::-webkit-scrollbar{
-    width: 25px;
+    width: 20px;
     border: 1px solid rgba(0, 0, 50, .2);
 }
 ::-webkit-scrollbar-thumb{
@@ -18,7 +16,7 @@ body{
 }
 
 #question-table-wrapper{
-    height: 300px;
+    height: calc(100vh - 50px);
     overflow-y: scroll;
     overflow-x: hidden;
 }
@@ -45,7 +43,7 @@ body{
 }
 
 #client-control-pane{
-    height: 330px;
+    height: calc(100vh - 20px);
     overflow-y: scroll;
 }
 
diff --git a/comm/server/templates/index.html b/comm/server/templates/index.html
index bb8456d24c04405086c733e5a005ff0416e2a4f1..112c8f068492203682a5264cde94944aec386875 100644
--- a/comm/server/templates/index.html
+++ b/comm/server/templates/index.html
@@ -15,9 +15,9 @@
 
 <div id="wrapper">
         
-    <div id="contorol-panel-wrapper" class="container-fluid">
+    <div id="control-panel-wrapper" class="container-fluid">
 
-        <div class="row">
+        <div id="control-panel-row" class="row">
             <div class="col-5" id="question-control-pane">
                 <h3>問題一覧</h3>&nbsp;
                 <span><a href="/#" id="view-server-status-button">システム状況</a></span>