diff --git a/views/_layouts/default.jet b/views/_layouts/default.jet
index 54691e0..526708c 100644
--- a/views/_layouts/default.jet
+++ b/views/_layouts/default.jet
@@ -53,9 +53,9 @@
               <div class="navbar-dropdown ">
                 <a class="navbar-item" href="/system/role/">{{ i18n("menu.role") }}</a>
                 <a class="navbar-item" href="/system/user/">{{ i18n("menu.user") }}</a>
+                <a class="navbar-item" href="/system/chart/">{{ i18n("menu.chart") }}</a>
                 <a class="navbar-item" href="/system/setting/">{{ i18n("menu.setting") }}</a>
                 <a class="navbar-item" href="/system/event/">{{ i18n("menu.event") }}</a>
-                <a class="navbar-item" href="/system/chart/">{{ i18n("menu.chart") }}</a>
                 <hr class="navbar-divider">
                 <div class="navbar-item">
                   <div class="navbar-content">
diff --git a/views/system/chart/_base.jet b/views/system/chart/_base.jet
index 616b09b..469fe59 100644
--- a/views/system/chart/_base.jet
+++ b/views/system/chart/_base.jet
@@ -18,15 +18,15 @@
           <li>
             <a href="/system/user/">{{ i18n("menu.user") }}</a>
           </li>
+          <li class="is-active">
+            <a href="/system/chart/">{{ i18n("menu.chart") }}</a>
+          </li>
           <li>
             <a href="/system/setting/">{{ i18n("menu.setting") }}</a>
           </li>
           <li>
             <a href="/system/event/">{{ i18n("menu.event") }}</a>
           </li>
-          <li class="is-active">
-            <a href="/system/chart/">{{ i18n("menu.chart") }}</a>
-          </li>
         </ul>
       </nav>
     </div>
diff --git a/views/system/event/list.jet b/views/system/event/list.jet
index 76f4e8b..8d2f9d3 100644
--- a/views/system/event/list.jet
+++ b/views/system/event/list.jet
@@ -23,15 +23,15 @@
           <li>
             <a href="/system/user/">{{ i18n("menu.user") }}</a>
           </li>
+          <li>
+            <a href="/system/chart/">{{ i18n("menu.chart") }}</a>
+          </li>
           <li>
             <a href="/system/setting/">{{ i18n("menu.setting") }}</a>
           </li>
           <li class="is-active">
             <a href="/system/event/">{{ i18n("menu.event") }}</a>
           </li>
-          <li>
-            <a href="/system/chart/">{{ i18n("menu.chart") }}</a>
-          </li>
         </ul>
       </nav>
     </div>
diff --git a/views/system/role/_base.jet b/views/system/role/_base.jet
index 714acfd..2782dba 100644
--- a/views/system/role/_base.jet
+++ b/views/system/role/_base.jet
@@ -18,15 +18,15 @@
           <li>
             <a href="/system/user/">{{ i18n("menu.user") }}</a>
           </li>
+          <li>
+            <a href="/system/chart/">{{ i18n("menu.chart") }}</a>
+          </li>
           <li>
             <a href="/system/setting/">{{ i18n("menu.setting") }}</a>
           </li>
           <li>
             <a href="/system/event/">{{ i18n("menu.event") }}</a>
           </li>
-          <li>
-            <a href="/system/chart/">{{ i18n("menu.chart") }}</a>
-          </li>
         </ul>
       </nav>
     </div>
diff --git a/views/system/setting/index.jet b/views/system/setting/index.jet
index 568dc86..a8dc2ea 100644
--- a/views/system/setting/index.jet
+++ b/views/system/setting/index.jet
@@ -24,15 +24,15 @@
           <li>
             <a href="/system/user/">{{ i18n("menu.user") }}</a>
           </li>
+          <li>
+            <a href="/system/chart/">{{ i18n("menu.chart") }}</a>
+          </li>
           <li class="is-active">
             <a href="/system/setting/">{{ i18n("menu.setting") }}</a>
           </li>
           <li>
             <a href="/system/event/">{{ i18n("menu.event") }}</a>
           </li>
-          <li>
-            <a href="/system/chart/">{{ i18n("menu.chart") }}</a>
-          </li>
         </ul>
       </nav>
     </div>
diff --git a/views/system/user/_base.jet b/views/system/user/_base.jet
index 7b8b970..3a53648 100644
--- a/views/system/user/_base.jet
+++ b/views/system/user/_base.jet
@@ -18,15 +18,15 @@
           <li class="is-active">
             <a href="/system/user/">{{ i18n("menu.user") }}</a>
           </li>
+          <li>
+            <a href="/system/chart/">{{ i18n("menu.chart") }}</a>
+          </li>
           <li>
             <a href="/system/setting/">{{ i18n("menu.setting") }}</a>
           </li>
           <li>
             <a href="/system/event/">{{ i18n("menu.event") }}</a>
           </li>
-          <li>
-            <a href="/system/chart/">{{ i18n("menu.chart") }}</a>
-          </li>
         </ul>
       </nav>
     </div>
diff --git a/views/system/user/detail.jet b/views/system/user/detail.jet
index 5df7674..b6233d8 100644
--- a/views/system/user/detail.jet
+++ b/views/system/user/detail.jet
@@ -48,7 +48,7 @@
       <dt class="has-text-left">{{ i18n("field.updated-at") }}</dt>
       <dd>{{ time(.User.UpdatedAt) }}</dd>
       {{if .Roles}}
-      <dt class="has-text-left">Roles</dt>
+      <dt class="has-text-left">{{ i18n("field.role") }}</dt>
       <dd>
         <div class="tags">
         {{ roles := .Roles }}
diff --git a/views/system/user/edit.jet b/views/system/user/edit.jet
index 0220536..fe7d99b 100644
--- a/views/system/user/edit.jet
+++ b/views/system/user/edit.jet
@@ -70,7 +70,7 @@
         </div>
       </div>
       <div class="field">
-        <label class="label">Roles</label>
+        <label class="label">{{ i18n("field.role") }}</label>
         <div class="control">
           {{ roles := .UserRoles }}
           {{range .Roles}}