diff --git a/packages/analytics/src/controllers/index.js b/packages/analytics/src/controllers/index.js
index aa9980f..77e736b 100644
--- a/packages/analytics/src/controllers/index.js
+++ b/packages/analytics/src/controllers/index.js
@@ -1,15 +1,15 @@
 import { userCount } from '../models/users.js'
-import { questCount, questCompleted } from '../models/profiles.js'
+import { totalQuests, totalCompleted } from '../models/profiles.js'
 
 // eslint-disable-next-line import/prefer-default-export
 export async function homeController(req, res) {
   const payload = {
     title: 'Linux Odyssey Admin',
     userCount: await userCount(),
-    questCount: await questCount(),
-    questCompleted: await questCompleted(),
+    totalQuests: await totalQuests(),
+    totalCompleted: await totalCompleted(),
   }
   payload.completedRate =
-    Math.round((payload.questCompleted / payload.questCount) * 10000) / 100
+    Math.round((payload.totalCompleted / payload.totalQuests) * 10000) / 100
   res.render('home', payload)
 }
diff --git a/packages/analytics/src/models/profiles.js b/packages/analytics/src/models/profiles.js
index 669afff..31cbb67 100644
--- a/packages/analytics/src/models/profiles.js
+++ b/packages/analytics/src/models/profiles.js
@@ -2,11 +2,11 @@
 /* eslint-disable func-names */
 import { UserProfile } from '@linux-odyssey/models'
 
-export function questCount() {
+export function totalQuests() {
   return UserProfile.find().count()
 }
 
-export function questCompleted() {
+export function totalCompleted() {
   return UserProfile.find({
     $where: function () {
       for (const key in this.progress) {
@@ -18,3 +18,7 @@ export function questCompleted() {
     },
   }).count()
 }
+
+export function userProfileList() {
+  return UserProfile.find()
+}
diff --git a/packages/analytics/views/home.handlebars b/packages/analytics/views/home.handlebars
index 3098257..d96f890 100644
--- a/packages/analytics/views/home.handlebars
+++ b/packages/analytics/views/home.handlebars
@@ -1,6 +1,6 @@
 <h1>Welcome to {{title}}</h1>
 <div>
-  <h2>Users</h2>
+  <h2>Overview</h2>
   <table>
     <tr>
       <th>Registered Users</th>
@@ -8,11 +8,11 @@
     </tr>
     <tr>
       <th>Total Started Quests</th>
-      <td>{{questCount}}</td>
+      <td>{{totalQuests}}</td>
     </tr>
     <tr>
       <th>Completed Quests</th>
-      <td>{{questCompleted}}</td>
+      <td>{{totalCompleted}}</td>
     </tr>
     <tr>
       <th>Completed Rate</th>
diff --git a/packages/analytics/views/sessionDetail.handlebars b/packages/analytics/views/sessionDetail.handlebars
index d43b8fe..c209bfc 100644
--- a/packages/analytics/views/sessionDetail.handlebars
+++ b/packages/analytics/views/sessionDetail.handlebars
@@ -36,20 +36,20 @@
 
     <table>
       <tr>
-        <th>Command</th>
+        <th>Stage</th>
         <th>PWD</th>
+        <th>Input</th>
         <th>Output</th>
         <th>Error</th>
-        <th>Stage</th>
-        <th>Created At</th>
+        <th>Input Time</th>
       </tr>
       {{#each commands}}
         <tr>
-          <td>{{command}}</td>
+          <td>{{stage}}</td>
           <td>{{pwd}}</td>
+          <td>{{command}}</td>
           <td>{{output}}</td>
           <td>{{error}}</td>
-          <td>{{stage}}</td>
           <td>{{createdAt}}</td>
         </tr>
       {{/each}}
diff --git a/packages/analytics/views/sessions.handlebars b/packages/analytics/views/sessions.handlebars
index 6fff971..99469bb 100644
--- a/packages/analytics/views/sessions.handlebars
+++ b/packages/analytics/views/sessions.handlebars
@@ -4,23 +4,23 @@
     <tr>
       <th>User</th>
       <th>Quest</th>
-      <th></th>
       <th>Status</th>
       <th>Created At</th>
       <th>Finished At</th>
       <th>Used Time</th>
       <th>Command Count</th>
+      <th>Session</th>
     </tr>
     {{#each sessions}}
       <tr>
         <td>{{user}}</td>
         <td>{{quest}}</td>
-        <td><a href='/sessions/{{_id}}'>Detail</a></td>
         <td>{{status}}</td>
         <td>{{createdAt}}</td>
         <td>{{finishedAt}}</td>
         <td>{{usedTime}}</td>
         <td>{{commandCount}}</td>
+        <td><a href='/sessions/{{_id}}'>Detail</a></td>
       </tr>
     {{/each}}
   </table>