diff --git a/mysite/db.sqlite3 b/mysite/db.sqlite3
index be727e11e1a46022875ec0fbba18af29ccb0e836..e887e0e2f246ef1c416bc455d686c763a091f61d 100644
Binary files a/mysite/db.sqlite3 and b/mysite/db.sqlite3 differ
diff --git a/mysite/kaoshi/admin.py b/mysite/kaoshi/admin.py
index 33937e0416af8b22cb2c1d408ff933c03a099e6c..2735ca89ff77707f041570a196303cacfbceb3d4 100644
--- a/mysite/kaoshi/admin.py
+++ b/mysite/kaoshi/admin.py
@@ -1,5 +1,21 @@
 from django.contrib import admin
 
-from .models import Question
+from .models import Choice, Question
 
-admin.site.register(Question)
\ No newline at end of file
+
+class ChoiceInline(admin.TabularInline):
+    model = Choice
+    extra = 1
+
+
+class QuestionAdmin(admin.ModelAdmin):
+    fieldsets = [
+        (None,               {'fields': ['question_text']}),
+        ('Date information', {'fields': ['pub_date'], 'classes': ['collapse']}),
+    ]
+    inlines = [ChoiceInline]
+    list_display = ('question_text', 'pub_date', 'was_published_recently')
+    list_filter = ['pub_date']
+    search_fields = ['question_text']
+
+admin.site.register(Question, QuestionAdmin)
\ No newline at end of file
diff --git a/mysite/kaoshi/models.py b/mysite/kaoshi/models.py
index 8367875b276143fd5c8db085fa999768f055086d..7f1798b97deeda72d8b6a8edaaef8765f4c39914 100644
--- a/mysite/kaoshi/models.py
+++ b/mysite/kaoshi/models.py
@@ -2,6 +2,7 @@ import datetime
 
 from django.db import models
 from django.utils import timezone
+from django.contrib import admin
 
 class Question(models.Model):
     question_text = models.CharField(max_length=200)
@@ -10,6 +11,12 @@ class Question(models.Model):
     def __str__(self):
         return self.question_text
 
+    @admin.display(
+        boolean=True,
+        ordering='pub_date',
+        description='Published recently?',
+    )
+
     def was_published_recently(self):
         now = timezone.now()
         return now - datetime.timedelta(days=1) <= self.pub_date <= now
diff --git a/mysite/kaoshi/templates/admin/base_site.html b/mysite/kaoshi/templates/admin/base_site.html
new file mode 100644
index 0000000000000000000000000000000000000000..5d26dac7b0a9186baa14ee2ac06a19207232d968
--- /dev/null
+++ b/mysite/kaoshi/templates/admin/base_site.html
@@ -0,0 +1,9 @@
+{% extends "admin/base.html" %}
+
+{% block title %}{% if subtitle %}{{ subtitle }} | {% endif %}{{ title }} | {{ site_title|default:_('Django site admin') }}{% endblock %}
+
+{% block branding %}
+<h1 id="site-name"><a href="{% url 'admin:index' %}">我的站点</a></h1>
+{% endblock %}
+
+{% block nav-global %}{% endblock %}
diff --git a/mysite/mysite/__pycache__/settings.cpython-39.pyc b/mysite/mysite/__pycache__/settings.cpython-39.pyc
index 9264b148a80f0f49d447623451acf6b138402036..2c4ed508fa3727e5f36b3fb836e57464a5893691 100644
Binary files a/mysite/mysite/__pycache__/settings.cpython-39.pyc and b/mysite/mysite/__pycache__/settings.cpython-39.pyc differ
diff --git a/mysite/mysite/settings.py b/mysite/mysite/settings.py
index 88c323cf38f6419e1dec17a3e88150181993cdea..23162a67b042be0291d3a2ac2350824f4a1d7beb 100644
--- a/mysite/mysite/settings.py
+++ b/mysite/mysite/settings.py
@@ -55,7 +55,7 @@ ROOT_URLCONF = 'mysite.urls'
 TEMPLATES = [
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': [],
+        'DIRS': [BASE_DIR / 'templates'],
         'APP_DIRS': True,
         'OPTIONS': {
             'context_processors': [