diff --git a/frontend/admin/package.json b/frontend/admin/package.json
index 05898757..3f680f9e 100644
--- a/frontend/admin/package.json
+++ b/frontend/admin/package.json
@@ -45,6 +45,7 @@
     "vue-loader": "^8.3.0",
     "vue-resource": "^0.9.3",
     "vue-router": "^0.7.13",
+    "vue-strap": "^1.0.11",
     "vue-style-loader": "^1.0.0",
     "webpack": "^1.12.2",
     "webpack-dev-middleware": "^1.4.0",
diff --git a/frontend/admin/src/components/problem/createProblem.vue b/frontend/admin/src/components/problem/createProblem.vue
index f629b7f8..347e02a0 100644
--- a/frontend/admin/src/components/problem/createProblem.vue
+++ b/frontend/admin/src/components/problem/createProblem.vue
@@ -15,11 +15,14 @@
         <div class="col-md-3">
             <div class="form-group">
                 <label>{{ $t("problem.timeLimit") }}</label>
+                <help name="timeLimit"></help>
                 <input type="number" class="form-control" required>
             </div>
         </div>
         <div class="col-md-3">
-            <div class="form-group"><label>{{ $t("problem.memoryLimit") }}</label>
+            <div class="form-group">
+                <label>{{ $t("problem.memoryLimit") }}</label>
+                <help name="memoryLimit"></help>
                 <input type="number" class="form-control" required>
             </div>
         </div>
@@ -45,6 +48,11 @@
         <problem-sample v-ref:sample></problem-sample>
         <test-case-mgnt v-ref:testcase></test-case-mgnt>
 
+        <div class="col-md-12">
+            <code-mirror></code-mirror>
+        </div>
+
+
 
     </div>
 </template>
@@ -56,6 +64,8 @@
     import back from "../utils/back.vue"
     import simditor from "../utils/simditor.vue"
     import tagInput from "../utils/tagInput.vue"
+    import codeMirror from "../utils/codeMirror.vue"
+    import help from "../utils/help.vue"
 
     export default({
         data() {
@@ -68,7 +78,9 @@
             problemSample,
             back,
             simditor,
-            tagInput
+            tagInput,
+            codeMirror,
+            help
         },
         ready() {
             this.$refs.testcase.setTestCase([{input_name: "1.in", output_name: "1.out"}], false);
diff --git a/frontend/admin/src/components/utils/help.vue b/frontend/admin/src/components/utils/help.vue
new file mode 100644
index 00000000..8dea8c16
--- /dev/null
+++ b/frontend/admin/src/components/utils/help.vue
@@ -0,0 +1,26 @@
+<template>
+    <span>
+        <popover trigger="hover" effect="fade" placement="top" header="false"
+                 v-bind:content="translate()">
+            <span class="glyphicon glyphicon-question-sign"></span>
+        </popover>
+    </span>
+</template>
+
+<script>
+    import {popover} from "vue-strap"
+
+    export default({
+        props: {
+            name: ""
+        },
+        methods: {
+            translate() {
+                return this.$t("help." + this.name);
+            }
+        },
+        components: {
+            popover
+        }
+    })
+</script>
\ No newline at end of file
diff --git a/frontend/admin/src/locales.js b/frontend/admin/src/locales.js
index 6eb2d28b..3777f357 100644
--- a/frontend/admin/src/locales.js
+++ b/frontend/admin/src/locales.js
@@ -111,6 +111,10 @@ export default {
             chooseFile: "选择文件",
 
             unsupportedBrowserWarningMsg: "当前网页 <strong>不支持</strong> 你正在使用的浏览器, 为了正常的访问,请到 <a href=\"http://browsehappy.com/\"> 升级你的浏览器</a>"
+        },
+        help: {
+            timeLimit: "1-1000ms",
+            memoryLimit: "最小16M, Java最小32M"
         }
     }
 };
\ No newline at end of file
diff --git a/frontend/admin/src/main.js b/frontend/admin/src/main.js
index 7f03fc79..6aac20b0 100644
--- a/frontend/admin/src/main.js
+++ b/frontend/admin/src/main.js
@@ -154,8 +154,6 @@ router.redirect({"/user": "/user/1"});
 router.redirect({"/announcement": "/announcement/1"});
 router.redirect({"/problem": "problem/1"});
 
-setTimeout(function(){
 // hide loading
 document.getElementById("loading").style.display = "none";
 router.start(App, '#app');
-}, 1500);