diff --git a/index.html b/index.html
index f9a20a0..5d3d732 100755
--- a/index.html
+++ b/index.html
@@ -19,53 +19,20 @@
   <td>
     <table class="border">
         <tr>
-            <th colspan="5">Raspberry pi 2 B+</th>
+            <th colspan="3">Raspberry pi 2 B+</th>
         </tr>
-	<tr>
+		<tr>
             <td width="40" height="230"></td>
-            <td width="180" height="230" colspan="1">
-                <a href="postgis.html">
-                    <img alt="PostGIS" width="160" height="160" src="img/logo_postgis.jpg" /><br/>
-                    PostGIS service<br/>5432
+            <td width="180">
+                <a href="http://surveyor.mydns.jp/archiva/">
+                    <img src="img/Archiva.png" width="120" alt="archiva"/><br/>archiva (8080)
                 </a>
             </td>
-            <td width="180" height="230" colspan="1">
-                <a href="http://surveyor.mydns.jp/archiva/">
-                    <img src="img/Archiva.png" width="160" alt="archiva"/><br/>archiva
-                </a><br/>8080
-            </td>
-            <td width="40" height="230"></td>
-	</tr>
-	<tr>
-            <td width="55" height="140"></td>
-            <td height="120" colspan="2">
-                <table>
-                    <tr>
-                        <td height="120">
-                            <a href="/owncloud"><img src="img/owncloud.jpg" width="96" height="96" alt="owncloud"/></a>
-                        </td>
-                        <td height="120">
-                            <a href="https://yuuhayashi.github.io/coverageWeb/">
-                                <img src="img/logo_github.png" alt="osmCoverage"/><br/>OSM coverage
-                            </a><br/>github pages
-                        </td>
-                        <td height="120">
-                            <a href="/coverage/index.html">
-                                <img src="img/OSM_Logo_design_Ben_Hall.png" width="100" height="91" alt="osmCoverage"/><br/>OSM coverage
-                            </a><br/>80
-                        </td>
-                        <td height="120">
-                            <a href="/cacert.pem"><img src="img/cert.png" width="68" height="86" alt="root cert"/></a>
-                        </td>
-                    </tr>
-                </table>
-            </td>
-            <td width="55" height="230"></td>
-	</tr>
+            <td width="40"></td>
+		</tr>
         <tr>
-            <td colspan="5" height="40">
-                <p align="right"><a href="https://nginx.org">nginx</a><br/>
-                http://192.168.0.200:80/<br/>
+            <td colspan="3" height="60">
+                <p align="right">http://192.168.0.200:80/ (<a href="https://nginx.org">nginx</a>)<br/>
                 raspi2:/var/www/html</p>
             </td>
         </tr>
@@ -73,85 +40,165 @@
   </td>
   <td>
     <table class="border">
-    <tr>
-        <th colspan="4">Raspberry pi 3 B+</th>
-    </tr>
-	<tr>
+	    <tr>
+	        <th colspan="3">Raspberry pi 3 B+</th>
+	    </tr>
+		<tr>
             <td width="55" height="230"></td>
-            <td width="220" height="230" colspan="1">
+            <td width="220">
                 <a href="http://surveyor.mydns.jp/gitbucket/">
-                    <img src="img/gitbucket.png" width="160" height="160" alt="GitBucket"/><br/>GitBucket
-                </a><br/>8200
+                    <img src="img/gitbucket.png" width="80" height="80" alt="GitBucket"/><br/>GitBucket (8200)
+                </a>
+                <br/>
+                <a href="http://surveyor.mydns.jp/osm-data/">
+                    <img src="img/OSM_Logo_design_Ben_Hall.png" width="80" height="80" alt="osm-data"/><br/>osm-data (80)
+                </a>
             </td>
-            <td width="220" height="230" colspan="1">
-              <p>
-                <a href="http://surveyor.mydns.jp/solr/">
-                    <img src="img/640x363-Solr-1.png" width="160" alt="solr"/><br/>solr
-                </a><br/>8983
-              </p>
-              <p>
-                <a href="http://surveyor.mydns.jp/talk-ja/">Talk-ja検索
-                </a><br/>8210
-              </p>
-            </td>
-            <td width="55" height="230"></td>
-	</tr>
-	<tr>
-            <td width="55" height="230"></td>
-            <td width="220" height="230" colspan="2">
-                <a href="http://surveyor.mydns.jp/unMapped/">
-                    <img src="img/GlassFish_logo.png" width="200" height="114" alt="UnMapped"/><br/>UnMapped
-                </a><br/>8181
-            </td>
-            <td width="55" height="230"></td>
-	</tr>
+            <td width="55"></td>
+		</tr>
         <tr>
-            <td colspan="4" height="40">
-                <p align="right">
-                    <a href="https://javaee.github.io/glassfish/">GlassFish</a><br/>
-                    http://192.168.0.201:4848/<br/>
-                    raspi3:/home/pi/glassfish4/glassfish/domains/domain1
-                </p>
+            <td colspan="3" height="60">
+            </td>
+        </tr>
+    </table>
+  </td>
+  <td>
+    <table class="border">
+	    <tr>
+	        <th colspan="3">T3400 Core2-Duo 2.8MHz</th>
+	    </tr>
+		<tr>
+            <td width="55" height="230"></td>
+            <td width="220" height="230">
+                <a href="http://surveyor.mydns.jp/task-bldg/">
+                    <img src="img/OSM_Logo_design_Ben_Hall.png" width="160" height="160" alt="task-bldg"/><br/>task-bldg
+                </a><br/>8083
+            </td>
+            <td width="55" height="230"></td>
+		</tr>
+        <tr>
+            <td colspan="3" height="60">
             </td>
         </tr>
     </table>
   </td>
 </tr>
 <tr>
-    <td colspan="2">
-        <table>
-        <tr>
-            <td>
-                <a href="https://github.com/yuuhayashi/coverageWeb/wiki">
-                    <img alt="coverageWeb" width="20" height="17" src="img/logo_github.png" />coverageWeb
-                </a>
-            </td>
-            <td>
-                <a href="https://osdn.net/projects/importpicture/">
-                    <img src="img/OSDN_logo-simple_h24.png" alt="AdjustTime2" width="21" height="12"/>AdjustTime2
-                </a>
-            </td>
-            <td>
-                <a href="https://osdn.net/projects/osm-ja/downloads/57034/ConvAdmPt.zip/">
-                    <img src="img/OSDN_logo-simple_h24.png" alt="ConvAdmPt" width="21" height="12"/>ConvAdmPt
-                </a>
-            </td>
-            <td>
-                <a href="https://osdn.net/projects/osm-ja/downloads/57031/ConvCommPt.zip/">
-                    <img src="img/OSDN_logo-simple_h24.png" alt="ConvCommPt" width="21" height="12"/>ConvCommPt
-                </a>
-            </td>
-            <td>
-                <a href="https://github.com/yuuhayashi/Movie2jpg/blob/master/src/README.md">
-                    <img src="img/logo_docker.png" alt="haya4/movie2jpg" width="20" height="19"/>haya4/movie2jpg
-                </a>
-            </td>
-            <td>
-                <a href="https://hub.docker.com/r/haya4/mapillary-tools/">
-                    <img src="img/logo_docker.png" alt="haya4/mapillary-tools" width="20" height="19"/>haya4/mapillary-tools
-                </a>
-            </td>
-        </tr>
+  <td colspan="3">
+  	<hr>
+  </td>
+</tr>
+<tr>
+    <td>
+        <table class="border">
+		    <tr>
+		        <th colspan="4">
+		        外部サーバ
+		        </th>
+		    </tr>
+	        <tr>
+	            <td>
+                    <a href="https://yuuhayashi.github.io/coverageWeb/">
+                        <img src="img/logo_github.png" alt="osmCoverage"/><br/>OSM coverage
+                    </a><br/>github pages
+	            </td>
+	        </tr>
+        </table>
+    </td>
+    <td>
+        <table class="border">
+		    <tr>
+		        <th colspan="4">
+		        公開リポジトリ
+		        </th>
+		    </tr>
+	        <tr>
+	            <td>
+	            	<ul>
+		            	<li>
+			                <a href="https://github.com/yuuhayashi/coverageWeb/wiki">
+			                    <img alt="coverageWeb" width="20" height="17" src="img/logo_github.png" />coverageWeb
+			                </a>
+		            	</li>
+		            	<li>
+			                <a href="https://osdn.net/projects/importpicture/">
+			                    <img src="img/OSDN_logo-simple_h24.png" alt="AdjustTime2" width="21" height="12"/>AdjustTime2
+			                </a>
+		            	</li>
+		            	<li>
+			                <a href="https://osdn.net/projects/osm-ja/downloads/57034/ConvAdmPt.zip/">
+			                    <img src="img/OSDN_logo-simple_h24.png" alt="ConvAdmPt" width="21" height="12"/>ConvAdmPt
+			                </a>
+		            	</li>
+		            	<li>
+			                <a href="https://osdn.net/projects/osm-ja/downloads/57031/ConvCommPt.zip/">
+			                    <img src="img/OSDN_logo-simple_h24.png" alt="ConvCommPt" width="21" height="12"/>ConvCommPt
+			                </a>
+		            	</li>
+		            	<li>
+			                <a href="https://github.com/yuuhayashi/Movie2jpg/blob/master/src/README.md">
+			                    <img src="img/logo_docker.png" alt="haya4/movie2jpg" width="20" height="19"/>haya4/movie2jpg
+			                </a>
+		            	</li>
+						<li>
+			                <a href="https://hub.docker.com/r/haya4/mapillary-tools/">
+			                    <img src="img/logo_docker.png" alt="haya4/mapillary-tools" width="20" height="19"/>haya4/mapillary-tools
+			                </a>
+						</li>
+	            	</ul>
+	            </td>
+	        </tr>
+        </table>
+    </td>
+
+    <td>
+        <table class="border">
+		    <tr>
+		        <th colspan="4">
+		        休止中
+		        </th>
+		    </tr>
+	        <tr>
+	            <td>
+	            	<ul>
+		            	<li>
+	    	                <a href="postgis.html">
+			                    <img alt="PostGIS" width="32" height="32" src="img/logo_postgis.jpg" />PostGIS service (5432)
+			                </a>
+		            	</li>
+		            	<li>
+	                        <a href="/owncloud"><img src="img/owncloud.jpg" width="32" height="32" alt="owncloud"/></a>
+		            	</li>
+		            	<li>
+                            <a href="/coverage/index.html">
+                                <img src="img/OSM_Logo_design_Ben_Hall.png" width="32" alt="osmCoverage"/> OSM coverage (80)
+                            </a>
+		            	</li>
+		            	<li>
+                            <a href="/cacert.pem"><img src="img/cert.png" height="32" alt="root cert"/></a>
+		            	</li>
+		            	<li>
+		                    <a href="https://javaee.github.io/glassfish/">GlassFish</a><br/>
+		                    http://192.168.0.201:4848/<br/>
+		                    raspi3:/home/pi/glassfish4/glassfish/domains/domain1
+		            	</li>
+						<li>
+							<a href="http://surveyor.mydns.jp/solr/">
+							    <img src="img/640x363-Solr-1.png" width="32" alt="solr"/><br/>solr (8983)
+							</a>
+							<br/>
+							<a href="http://surveyor.mydns.jp/talk-ja/">Talk-ja検索 (8210)
+							</a>
+						</li>
+						<li>
+			                <a href="http://surveyor.mydns.jp/unMapped/">
+			                    <img src="img/GlassFish_logo.png" width="32" alt="UnMapped"/><br/>UnMapped (8181)
+			                </a>
+`						</li>
+
+	            	</ul>
+	            </td>
+	        </tr>
         </table>
     </td>
 </tr>
diff --git a/lib/surveyor.css b/lib/surveyor.css
index 05a9fa9..c2eb4e2 100755
--- a/lib/surveyor.css
+++ b/lib/surveyor.css
@@ -60,6 +60,10 @@
   font-style: italic;
 }
 
+li {
+	text-align: left;
+}
+
 table.wiki {
     margin: 20px 0 50px;
     border-top: 1px solid #CCC;