diff --git a/contest/views.py b/contest/views.py
index bc9eb35..7ad58b3 100644
--- a/contest/views.py
+++ b/contest/views.py
@@ -126,7 +126,10 @@ class ContestAdminAPIView(APIView):
         ---
         response_serializer: ContestSerializer
         """
-        contest = Contest.objects.all().order_by("-last_updated_time")
+        if request.user.admin_type == SUPER_ADMIN:
+            contest = Contest.objects.all().order_by("-last_update_time")
+        else:
+            contest = Contest.objects.filter(created_by=request.user).order_by("-last_updated_time")
         visible = request.GET.get("visible", None)
         if visible:
             contest = contest.filter(visible=(visible == "true"))
@@ -219,5 +222,12 @@ class ContestProblemAdminAPIView(APIView):
         if keyword:
             contest_problem = contest_problem.filter(Q(title__contains=keyword) |
                                                      Q(description__contains=keyword))
+        contest_id = request.GET.get("contest_id", None)
+        if contest_id:
+            try:
+                contest = Contest.objects.get(id=contest_id,created_by=request.user)
+            except Contest.DoesNotExist:
+                return error_response(u"非法的比赛ID")
+            contest_problem = contest_problem.filter(contest=contest).order_by("sort_index")
 
         return paginate(request, contest_problem, ContestProblemSerializer)
\ No newline at end of file
diff --git a/static/src/css/contest/add_contest.css b/static/src/css/contest/add_contest.css
new file mode 100644
index 0000000..af9ee38
--- /dev/null
+++ b/static/src/css/contest/add_contest.css
@@ -0,0 +1,5 @@
+.group-tag {
+    padding-left: 5px; color: #46799b; background: #e0eaf1; white-space: nowrap;
+    overflow: hidden; cursor: pointer; border-radius: 2px 0 0 2px;
+            float: left; padding: 0 4px;box-sizing: border-box;list-style-type: none; margin: 5px;
+}
diff --git a/static/src/js/app/admin/contest/edit_problem.js b/static/src/js/app/admin/contest/edit_problem.js
new file mode 100644
index 0000000..e69de29
diff --git a/template/admin/contest/edit_problem.html b/template/admin/contest/edit_problem.html
new file mode 100644
index 0000000..e69de29