diff --git a/proj/settings.py b/proj/settings.py
index 06ce1036..b4a7a49e 100644
--- a/proj/settings.py
+++ b/proj/settings.py
@@ -85,10 +85,7 @@ USE_L10N = False
 USE_TZ = False
 
 
-MEDIA_ROOT = os.path.join(SITE_ROOT, 'media/')
 CKEDITOR_UPLOAD_PATH = os.path.join(SITE_ROOT, 'media/upload')
-
-
 CKEDITOR_CONFIGS = {
     'default': {
         'toolbar': 'standart',
@@ -114,13 +111,13 @@ CKEDITOR_CONFIGS = {
 }
 
 MEDIA_URL = '/media/'
+MEDIA_ROOT = os.path.join(SITE_ROOT, 'media/')
 
 STATIC_URL = '/static/'
 STATIC_ROOT = os.path.join(SITE_ROOT, 'collected_static')
 STATICFILES_DIRS = (
-    (os.path.join(SITE_ROOT, 'static')),
+    os.path.join(SITE_ROOT, 'static'),
 )
-
 STATICFILES_FINDERS = (
     'django.contrib.staticfiles.finders.FileSystemFinder',
     'django.contrib.staticfiles.finders.AppDirectoriesFinder',
@@ -471,7 +468,6 @@ DEFAULT_PAGINATOR = Paginator
 ADMIN_PAGINATION = 20
 CLIENT_PAGINATION = 25
 
-TEMPLATE_DEBUG = DEBUG
 NO_LOGO = '/static/client/img/no-logo.png'
 
 # events settings
diff --git a/support/nginx.conf b/support/nginx.conf
index 6bed0bd5..45330e46 100644
--- a/support/nginx.conf
+++ b/support/nginx.conf
@@ -49,7 +49,7 @@ server {
     location /static {
         access_log off;
         expires max;
-        root   /home/www/proj;
+        alias   /home/www/proj/collected_static;
     }
 
     location /media {
@@ -61,7 +61,7 @@ server {
     location /templates {
         access_log off;
         expires max;
-        root   /home/www/proj/static;
+        alias   /home/www/proj/collected_static/templates;
     }
 
 }