diff --git a/project/settings.py b/project/settings.py
index 4a156847..2934c1de 100644
--- a/project/settings.py
+++ b/project/settings.py
@@ -85,7 +85,6 @@ TEMPLATES = [
         'DIRS': [
             'project',
         ],
-        'APP_DIRS': True,
         'OPTIONS': {
             'context_processors': [
                 'project.context_processors.config',
@@ -94,23 +93,18 @@ TEMPLATES = [
                 'django.contrib.auth.context_processors.auth',
                 'django.contrib.messages.context_processors.messages',
             ],
+            'loaders': [
+                ('django.template.loaders.cached.Loader', [
+                    'django.template.loaders.filesystem.Loader',
+                    'django.template.loaders.app_directories.Loader',
+                ]),
+            ],
         },
     },
 ]
 
 WSGI_APPLICATION = 'project.wsgi.application'
 
-
-# Database
-# https://docs.djangoproject.com/en/2.0/ref/settings/#databases
-
-# DATABASES = {
-#     'default': {
-#         'ENGINE': 'django.db.backends.sqlite3',
-#         'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
-#     }
-# }
-
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.postgresql',
diff --git a/project/urls.py b/project/urls.py
index b8f22484..cfa253e1 100644
--- a/project/urls.py
+++ b/project/urls.py
@@ -13,10 +13,11 @@ Including another URLconf
     1. Import the include() function: from django.urls import include, path
     2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
 """
+from django.conf import settings
 from django.contrib import admin
-from django.urls import path, include
 from django.views.generic import TemplateView
-from django.conf import settings
+from django.urls import path, include
+
 
 from apps.course.views import (
     CoursesView, likes, coursecomment,
@@ -82,8 +83,8 @@ if settings.DEBUG:
     from django.conf.urls.static import static
     from django.contrib.staticfiles.urls import staticfiles_urlpatterns
 
+    urlpatterns += static(settings.STATIC_URL, document_root=settings.MEDIA_ROOT)
+    urlpatterns += staticfiles_urlpatterns()
+
     if 'silk' in settings.INSTALLED_APPS:
         urlpatterns += [path('silk/', include('silk.urls', namespace='silk'))]
-
-    urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
-    urlpatterns += staticfiles_urlpatterns()