diff --git a/src/main/java/osm/surveyor/task/city/model/Operation.java b/src/main/java/osm/surveyor/task/city/model/Operation.java
index da1f020..f2d7327 100644
--- a/src/main/java/osm/surveyor/task/city/model/Operation.java
+++ b/src/main/java/osm/surveyor/task/city/model/Operation.java
@@ -7,12 +7,12 @@
  */
 public enum Operation {
 	NOP,			// ノーオペ
-    RESERVE, 		// 予約
-    CANCEL,			// 取消
-    DONE,			// インポート済み
+    RESERVE, 		// 担当登録
+    CANCEL,			// 編集中止
+    DONE,			// 編集完了
     VALID,			// 検証
-    OK,				// 検証済み
-    NG,				// 検証不良
-    END,			// 完了
+    NG,				// (deprecated)検証済み
+    OK,				// (deprecated)検証済み
+    END,			// (deprecated)完了
     VIEW			// 参照
 }
diff --git a/src/main/resources/i18n/messages_ja.properties b/src/main/resources/i18n/messages_ja.properties
index b7b231f..5a49b43 100644
--- a/src/main/resources/i18n/messages_ja.properties
+++ b/src/main/resources/i18n/messages_ja.properties
@@ -32,7 +32,7 @@
 download = ダウンロード
 return = 戻る
 reserve = 担当登録
-cancel = 担当取消
+cancel = 編集中止
 done = 編集完了
 NG = 検証(NG)
 OK = 検証(OK)
diff --git a/src/main/resources/templates/task.html b/src/main/resources/templates/task.html
index 1ee5b76..3c43a24 100644
--- a/src/main/resources/templates/task.html
+++ b/src/main/resources/templates/task.html
@@ -107,7 +107,8 @@
                     <label for="username" class="form-label">
                       コメント
                     </label>
-                    <input class="form-control" type="text" th:errorclass="is-invalid" th:field="*{comment}">
+                    <textarea class="form-control" rows="4" th:errorclass="is-invalid" th:field="*{comment}">
+                    </textarea>
                     <div class="invalid-feedback" th:errors="*{comment}">
                     </div>
                   </div>
diff --git a/src/main/resources/templates/tasks.html b/src/main/resources/templates/tasks.html
index 8b3b24f..a15b44c 100644
--- a/src/main/resources/templates/tasks.html
+++ b/src/main/resources/templates/tasks.html
@@ -54,7 +54,7 @@
                           <i th:text="#{meshcode}"></i> : <i th:text="*{meshcode}"></i>
                         </div>
                         <div>
-                          <i th:text="#{status}"></i> : <img th:alt="*{status}" th:src="@{/img/{status}.png(status=*{status})}"></img>
+                          <i th:text="#{status}"></i> : <img th:alt="*{status}" th:src="@{/img/{status}.png(status=*{status})}"></img> <i th:text="*{status}"></i>
                         </div>
                       </th>
                     </tr>