diff --git a/static/villeurbanne-2018/_custom.scss b/static/villeurbanne-2018/_custom.scss
index e82ce14b..1088853d 100644
--- a/static/villeurbanne-2018/_custom.scss
+++ b/static/villeurbanne-2018/_custom.scss
@@ -39,6 +39,13 @@ div#nav {
 	}
 }
 
+div.publik-container {
+	margin-top: 150px;
+	@media screen and (max-width: $mobile-limit) {
+		margin-top: 80px;
+	}
+}
+
 #main-content {
 	background: white;
 	padding: 10px;
@@ -104,10 +111,6 @@ div#rub_service {
 
 
 .gru-content {
-	margin-top: 150px;
-	@media screen and (max-width: $mobile-limit) {
-		margin-top: 50px;
-	}
 	div.cell, div.block, div.a2-block {
 		box-shadow: 0 0 10px 0 silver;
 		padding-bottom: 0.1ex;
diff --git a/templates/variants/villeurbanne-2018/prepare-template.py b/templates/variants/villeurbanne-2018/prepare-template.py
index f03ff7a6..d3b4f77a 100644
--- a/templates/variants/villeurbanne-2018/prepare-template.py
+++ b/templates/variants/villeurbanne-2018/prepare-template.py
@@ -69,9 +69,9 @@ banner_content = banner_content.replace(BANNER_FILENAME, '')
 
 publik_content = '''<div class="publik-container">
 {% block nav %}{% endblock %}
+{% block site-content %}
 {% block messages %}
 {% endblock %}
-{% block site-content %}
 {% endblock %}
 </div>'''
 
diff --git a/templates/variants/villeurbanne-2018/theme.html b/templates/variants/villeurbanne-2018/theme.html
index a30211c4..5e801539 100644
--- a/templates/variants/villeurbanne-2018/theme.html
+++ b/templates/variants/villeurbanne-2018/theme.html
@@ -43,21 +43,20 @@
 </nav>
 {% endblock %}
 
-{% block messages %}
-{% if messages %}
-<div id="messages">
-  <ul class="messages">
-      {% for message in messages %}
-      <li{% if message.tags %} class="{{ message.tags }}"{% endif %}>{{ message }}</li>
-      {% endfor %}
-  </ul>
-</div>
-{% endif %}
-{% endblock %}
-
 {% block site-content %}
 <div id="main-content-wrapper">
   <div id="main-content">
+    {% block messages %}
+    {% if messages %}
+    <div id="messages">
+      <ul class="messages">
+        {% for message in messages %}
+        <li{% if message.tags %} class="{{ message.tags }}"{% endif %}>{{ message }}</li>
+        {% endfor %}
+      </ul>
+    </div>
+    {% endif %}
+    {% endblock %}
     <div id="content" class="gru-content">
       {% block content %}
       {% endblock %}