diff --git a/src/components/Editor.vue b/src/components/editor/Editor.vue
similarity index 100%
rename from src/components/Editor.vue
rename to src/components/editor/Editor.vue
diff --git a/src/components/Editors.vue b/src/components/editor/Editors.vue
similarity index 96%
rename from src/components/Editors.vue
rename to src/components/editor/Editors.vue
index c0b29d3..fd3b16b 100644
--- a/src/components/Editors.vue
+++ b/src/components/editor/Editors.vue
@@ -83,9 +83,9 @@ import * as babelParser from "prettier/parser-babel"
 import * as estreeParser from "prettier/plugins/estree"
 import Editor from "./Editor.vue"
 import Toolbar from "./Toolbar.vue"
-import { html, css, js, tab, size, reset } from "../store/editors"
-import { taskId } from "../store/task"
-import { Submission } from "../api"
+import { html, css, js, tab, size, reset } from "../../store/editors"
+import { taskId } from "../../store/task"
+import { Submission } from "../../api"
 import { NCode, useDialog, useMessage } from "naive-ui"
 import { h, ref } from "vue"
 
diff --git a/src/components/Preview.vue b/src/components/editor/Preview.vue
similarity index 97%
rename from src/components/Preview.vue
rename to src/components/editor/Preview.vue
index 5dc48c7..a3ee42e 100644
--- a/src/components/Preview.vue
+++ b/src/components/editor/Preview.vue
@@ -36,8 +36,8 @@
 import { watchDebounced } from "@vueuse/core"
 import { computed, onMounted, useTemplateRef } from "vue"
 import { useRouter } from "vue-router"
-import { Submission } from "../api"
-import { submission } from "../store/submission"
+import { Submission } from "../../api"
+import { submission } from "../../store/submission"
 import { useMessage } from "naive-ui"
 import copy from "copy-text-to-clipboard"
 
diff --git a/src/components/Toolbar.vue b/src/components/editor/Toolbar.vue
similarity index 85%
rename from src/components/Toolbar.vue
rename to src/components/editor/Toolbar.vue
index 0eaefbc..6485dbc 100644
--- a/src/components/Toolbar.vue
+++ b/src/components/editor/Toolbar.vue
@@ -29,15 +29,15 @@
 <script lang="ts" setup>
 import { computed, h } from "vue"
 import { Icon } from "@iconify/vue"
-import { authed, roleNormal, roleSuper, user } from "../store/user"
-import { loginModal } from "../store/modal"
-import { show, panelSize } from "../store/panel"
-import { step } from "../store/tutorial"
-import { taskId } from "../store/task"
-import { Account } from "../api"
-import { Role } from "../utils/type"
-import { router } from "../router"
-import { ADMIN_URL } from "../utils/const"
+import { authed, roleNormal, roleSuper, user } from "../../store/user"
+import { loginModal } from "../../store/modal"
+import { show, panelSize } from "../../store/panel"
+import { step } from "../../store/tutorial"
+import { taskId } from "../../store/task"
+import { Account } from "../../api"
+import { Role } from "../../utils/type"
+import { router } from "../../router"
+import { ADMIN_URL } from "../../utils/const"
 
 const props = defineProps<{
   submitLoading: boolean
diff --git a/src/pages/ChallengeHome.vue b/src/pages/ChallengeHome.vue
index bfe6329..b8d7d0f 100644
--- a/src/pages/ChallengeHome.vue
+++ b/src/pages/ChallengeHome.vue
@@ -78,11 +78,12 @@ import { Icon } from "@iconify/vue"
 import { marked } from "marked"
 import PromptPanel from "../components/PromptPanel.vue"
 import ExternalAIPanel from "../components/ExternalAIPanel.vue"
-import Preview from "../components/Preview.vue"
+import Preview from "../components/editor/Preview.vue"
 import TaskStatsModal from "../components/TaskStatsModal.vue"
 import { Challenge, Submission } from "../api"
 import { html, css, js } from "../store/editors"
-import { taskId } from "../store/task"
+import { taskId, taskTab, challengeDisplay } from "../store/task"
+import { TASK_TYPE } from "../utils/const"
 import { authed, roleAdmin, roleSuper } from "../store/user"
 import {
   connectPrompt,
@@ -106,6 +107,8 @@ watch(streaming, (val) => {
 
 async function loadChallenge() {
   const display = Number(route.params.display)
+  taskTab.value = TASK_TYPE.Challenge
+  challengeDisplay.value = display
   const data = await Challenge.get(display)
   taskId.value = data.task_ptr
   challengeContent.value = await marked.parse(data.content, { async: true })
diff --git a/src/pages/Home.vue b/src/pages/Home.vue
index cc1d6d5..bece0ca 100644
--- a/src/pages/Home.vue
+++ b/src/pages/Home.vue
@@ -22,8 +22,8 @@
 </template>
 <script lang="ts" setup>
 import { useMagicKeys, whenever } from "@vueuse/core"
-import Editors from "../components/Editors.vue"
-import Preview from "../components/Preview.vue"
+import Editors from "../components/editor/Editors.vue"
+import Preview from "../components/editor/Preview.vue"
 import Task from "../components/Task.vue"
 import { show, panelSize } from "../store/panel"
 import { html, css, js } from "../store/editors"
diff --git a/src/pages/Submissions.vue b/src/pages/Submissions.vue
index bad74f2..318c05d 100644
--- a/src/pages/Submissions.vue
+++ b/src/pages/Submissions.vue
@@ -12,7 +12,7 @@
         style="height: 100%; padding-right: 10px; overflow: hidden"
       >
         <n-flex justify="space-between" style="flex-shrink: 0">
-          <n-button secondary @click="() => goHome($router, taskTab, step)">
+          <n-button secondary @click="() => goHome($router, taskTab, taskTab === TASK_TYPE.Challenge ? challengeDisplay : step)">
             首页
           </n-button>
           <n-flex align="center">
@@ -112,7 +112,7 @@ import { TASK_TYPE } from "../utils/const"
 import { watchDebounced } from "@vueuse/core"
 import { useRouter, useRoute } from "vue-router"
 
-import Preview from "../components/Preview.vue"
+import Preview from "../components/editor/Preview.vue"
 import TaskTitle from "../components/submissions/TaskTitle.vue"
 import CodeModal from "../components/submissions/CodeModal.vue"
 import ChainModal from "../components/submissions/ChainModal.vue"
@@ -120,7 +120,7 @@ import FlagCell from "../components/submissions/FlagCell.vue"
 import ExpandedSubTable from "../components/submissions/ExpandedSubTable.vue"
 
 import { submission } from "../store/submission"
-import { taskTab } from "../store/task"
+import { taskTab, challengeDisplay } from "../store/task"
 import { step } from "../store/tutorial"
 import { html as eHtml, css as eCss, js as eJs } from "../store/editors"
 import { roleAdmin, roleSuper, user } from "../store/user"