diff --git a/combo/manager/static/css/combo.manager.css b/combo/manager/static/css/combo.manager.css
index ebd69873..abb61621 100644
--- a/combo/manager/static/css/combo.manager.css
+++ b/combo/manager/static/css/combo.manager.css
@@ -2,18 +2,9 @@ div#meta {
 	margin-bottom: 1em;
 }
 
-div#sidebar {
-	width: 20em;
-	float: left;
-}
-
-div#page-content {
-	padding-left: 22em;
-	min-height: 5em;
-}
-
 div.page-options label {
 	display: block;
+	font-weight: bold;
 }
 
 div.placeholder {
@@ -372,5 +363,5 @@ span.extra-info {
 }
 
 img.page-picture {
-	max-width: 95%;
+	max-width: 100%;
 }
diff --git a/combo/manager/templates/combo/page_view.html b/combo/manager/templates/combo/page_view.html
index 7b4eb441..7369d374 100644
--- a/combo/manager/templates/combo/page_view.html
+++ b/combo/manager/templates/combo/page_view.html
@@ -15,12 +15,11 @@
   <a href="{% url 'combo-manager-page-view' pk=object.id %}">{% trans 'Page' %} - {{object.title }}</a>
 {% endblock %}
 
-{% block content %}
-
-<div id="sidebar">
+{% block sidebar %}
+<aside id="sidebar">
 
 <div class="page-options">
-<h2>{% trans 'Parameters' %}</h2>
+<h3>{% trans 'Parameters' %}</h3>
 
 <p>
 <label>{% trans 'Title:' %}</label>
@@ -71,7 +70,10 @@
 
 </div>
 
-</div> <!-- #sidebar -->
+</aside>
+{% endblock %} {# sidebar #}
+
+{% block content %}
 
 <div id="page-content">
 
diff --git a/data/themes/gadjo/static/css/agent-portal.css b/data/themes/gadjo/static/css/agent-portal.css
index 8d6ebd21..f45f8d8c 100644
--- a/data/themes/gadjo/static/css/agent-portal.css
+++ b/data/themes/gadjo/static/css/agent-portal.css
@@ -1,14 +1,3 @@
-body.with-sidebar div#main-content {
-	width: 70%;
-}
-
-body.with-sidebar div#sidebar {
-	float: right;
-	width: 23%;
-	margin-right: 2%;
-	color: #666;
-}
-
 div.welcome {
 	border: 1px solid #e4e4e4;
 	background: #fcfcfc;
diff --git a/data/themes/gadjo/templates/combo/page_template_sidebar.html b/data/themes/gadjo/templates/combo/page_template_sidebar.html
index 9cba816a..3a7631c0 100644
--- a/data/themes/gadjo/templates/combo/page_template_sidebar.html
+++ b/data/themes/gadjo/templates/combo/page_template_sidebar.html
@@ -1,8 +1,6 @@
 {% extends "combo/page_template.html" %}
 {% load combo i18n %}
 
-{% block bodyargs %}{{ block.super }} class="with-sidebar"{% endblock %}
-
 {% block combo-content %}
 <div id="page-content">
 {% trans "Content" as name %}
@@ -10,9 +8,9 @@
 </div>
 {% endblock %}
 
-{% block after-main-content %}
-<div id="sidebar">
+{% block sidebar %}
+<aside id="sidebar">
 {% trans "Sidebar" as name %}
 {% placeholder "sidebar" name=name %}
-</div>
+</aside>
 {% endblock %}