diff --git a/static/src/js/app/admin/contest/contest_list.js b/static/src/js/app/admin/contest/contest_list.js
index 823179e..ceafce1 100644
--- a/static/src/js/app/admin/contest/contest_list.js
+++ b/static/src/js/app/admin/contest/contest_list.js
@@ -14,8 +14,9 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "editor", "datetimePicker"]
                 page: 1,
                 totalPage: 1,
                 keyword: "",
-		editingContestId: 0,
-		editTitle: "",
+				editingContestId: 0,
+				editTitle: "",
+				editingProblemList: [],
                 getNext: function () {
                     if (!vm.nextPage)
                         return;
@@ -38,13 +39,14 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "editor", "datetimePicker"]
                     getPageData(page_index);
                 },
                 showEditContestArea: function (contestId) {
-			if (contestId == vm.editingContestId)
-				vm.editingContestId = 0;
-			else {
-				vm.editingContestId = contestId;
-				vm.editTitle = vm.contestList[contestId-1].title;
-				editor("#editor").setValue(vm.contestList[contestId-1].description);
-			}
+					if (contestId == vm.editingContestId)
+						vm.editingContestId = 0;
+					else {
+						vm.editingContestId = contestId;
+						vm.editTitle = vm.contestList[contestId-1].title;
+						editor("#editor").setValue(vm.contestList[contestId-1].description);
+						vm.editingProblemList = vm.contestList[contestId-1].problemList;
+					}
                 }
             });
 
@@ -74,7 +76,12 @@ require(["jquery", "avalon", "csrfToken", "bsAlert", "editor", "datetimePicker"]
                 }
             });
 */
-                        vm.contestList =[{id: 1, title:"The first contest", created_by: {username:"owen"}, description:"<p>this contest is just for<h1>fun</h1></p>"}]; 
+                        vm.contestList =[{
+							id: 1, title:"The first contest",
+							created_by: {username:"owen"},
+							description:"<p>this contest is just for<h1>fun</h1></p>",
+							problemList:[{title:"A+B problem", id:1, testCaseList:[1,2], samples:[1,2]}]
+							}]; 
                         vm.totalPage = 1;
                         vm.previousPage = false;
                         vm.nextPage = false;
diff --git a/template/admin/contest/contest_list.html b/template/admin/contest/contest_list.html
index 0df7ba3..9fd4874 100644
--- a/template/admin/contest/contest_list.html
+++ b/template/admin/contest/contest_list.html
@@ -52,32 +52,32 @@
                 <textarea id="editor" placeholder="这里输入内容" autofocus ms-duplex="editDescription"></textarea>
                 <small ms-visible="description==''" style="color:red">请填写比赛描述</small>
             </div>
-            <div class="col-md-6">
+            <div class="col-md-6 form-group">
                 <label>开始时间</label>
             </div>
-            <div class="col-md-6">
+            <div class="col-md-6 form-group">
                 <label>结束时间</label>
             </div>
-            <div class="col-md-6">
+            <div class="col-md-6 form-group">
                 <input type="text" class="form-control" name="start_time" id="contest_start_time"
                            ms-duplex="editStartTime">
             </div>
-            <div class="col-md-6">
+            <div class="col-md-6 form-group">
                 <input type="text" class="form-control" name="editEnd_time" id="contest_end_time" ms-duplex="endTime">
             </div>
-            <div class="col-md-6">
+            <div class="col-md-6 form-group">
                 <label>密码保护</label>
             </div>
-            <div class="col-md-3">
+            <div class="col-md-3 form-group">
                 <label>模式</label>
             </div>
-            <div class="col-md-3">
+            <div class="col-md-3 form-group">
                 <label>结束前是否开放排名</label>
             </div>
-            <div class="col-md-6">
+            <div class="col-md-6 form-group">
                 <input type="text" class="form-control" name="password" placeholder="留空就是公开赛" ms-duplex="editPassword">
             </div>
-            <div class="col-md-3">
+            <div class="col-md-3 form-group">
                     <label><input type="radio" name="mode" ms-duplex-checked="editMode">
                         <small>OI</small>
                     </label>
@@ -86,10 +86,31 @@
                     </label>
             </div>
             <div class="col-md-3">             
-                    <label class="text"><input type="checkbox" ms-duplex-checked="editShowRank">
-                        <small>开放排名</small>
-                    </label>
+					<div class="form-group">
+						<label class="text"><input type="checkbox" ms-duplex-checked="editShowRank">
+							<small>开放排名</small>
+						</label>
+                    </div>
             </div>
+            <div class="col-md-12">         
+				<table class="table table-striped">
+						<tr>
+							<th>编号</th>
+							<th>题目</th>
+							<th>测试数据</th>
+							<td></td>
+						</tr>
+						<tr ms-repeat="editingProblemList">
+							<td>题目{{ $index+1 }}</td>
+							<td>{{ el.title }}</td>
+							<td>{{ el.testCaseList.length }}组</td>
+							<td>
+								<a href="javascript:void(0)"class="btn-sm btn-info" ms-click="showProblemEditArea($index+1)">编辑</a>
+								<a href="javascript:void(0)"class="btn-sm btn-danger" ms-click="del_problem($index+1)">删除</a>
+							</td>
+						</tr>
+					</table>
+                </div>
     </div>
 
 </div>