diff --git a/data/themes/gadjo/static/css/agent-portal.css b/data/themes/gadjo/static/css/agent-portal.css
index a5864956..34ed7961 100644
--- a/data/themes/gadjo/static/css/agent-portal.css
+++ b/data/themes/gadjo/static/css/agent-portal.css
@@ -3,3 +3,7 @@ div.welcome {
 	background: #fcfcfc;
 	padding: 1ex;
 }
+
+div.textcell {
+	clear: both;
+}
diff --git a/data/themes/gadjo/static/js/agent-portal.js b/data/themes/gadjo/static/js/agent-portal.js
new file mode 100644
index 00000000..15610f7d
--- /dev/null
+++ b/data/themes/gadjo/static/js/agent-portal.js
@@ -0,0 +1,22 @@
+$(function() {
+  $(document).on('publik:environment-loaded', function(event, services) {
+    $(services.services).each(function(index, element) {
+      var $content = $('#portal-agent-content div.services-' + element.service_id);
+      if ($content.length === 0) {
+        $content = $('#portal-agent-content div.services');
+      }
+      if ($content.find('ul.apps').length === 0) {
+        $('<ul class="apps">').appendTo($content);
+      }
+      var $apps = $content.find('ul.apps');
+      $(element.data).each(function(index, menuitem) {
+        var li = $('<li><a href="' + menuitem.url + '">' + menuitem.label + '</a></li>').appendTo($apps);
+        if (menuitem.icon !== undefined) {
+          $(li).addClass('icon-' + menuitem.icon);
+        } else if (menuitem.slug !== undefined) {
+          $(li).addClass('icon-' + menuitem.slug);
+        }
+      });
+    });
+  });
+});
diff --git a/data/themes/gadjo/static/js/publik.js b/data/themes/gadjo/static/js/publik.js
index 1d6d936a..a5da4fb5 100644
--- a/data/themes/gadjo/static/js/publik.js
+++ b/data/themes/gadjo/static/js/publik.js
@@ -15,6 +15,7 @@ $(function() {
       window.sessionStorage.hobo_environment = JSON.stringify(COMBO_KNOWN_SERVICES);
       window.sessionStorage.hobo_environment_timestamp = Date.now();
       create_menu_items();
+      $(document).trigger('publik:environment-loaded', {services: COMBO_KNOWN_SERVICES});
     }
   }
 
@@ -72,6 +73,7 @@ $(function() {
   if (window.sessionStorage.hobo_environment &&
       parseInt(window.sessionStorage.hobo_environment_timestamp) > Date.now()-600000) {
     COMBO_KNOWN_SERVICES = JSON.parse(window.sessionStorage.hobo_environment);
+    $(document).trigger('publik:environment-loaded', {services: COMBO_KNOWN_SERVICES});
     create_menu_items();
   } else {
     $(COMBO_KNOWN_SERVICES).each(function(index, element) {
diff --git a/data/themes/gadjo/templates/combo/manager_base.html b/data/themes/gadjo/templates/combo/manager_base.html
deleted file mode 100644
index c1b3469c..00000000
--- a/data/themes/gadjo/templates/combo/manager_base.html
+++ /dev/null
@@ -1,38 +0,0 @@
-{% extends "gadjo/base.html" %}
-{% load staticfiles i18n %}
-
-{% block css %}
-<link rel="stylesheet" type="text/css" media="all" href="{{ STATIC_URL }}css/combo.manager.css"/>
-{% endblock %}
-
-{% block page-title %}Combo{% endblock %}
-{% block site-title %}Combo{% endblock %}
-{% block footer %}Combo — Copyright © Entr'ouvert{% endblock %}
-
-{% block homepage-url %}
-  {% url 'combo-manager-homepage' as default_homepage_url %}
-  {% firstof manager_homepage_url default_homepage_url %}
-{% endblock %}
-
-{% block homepage-title %}
-  {% trans 'Management' as default_homepage_title %}
-  {% firstof manager_homepage_title default_homepage_url %}
-{% endblock %}
-
-{% block more-user-links %}
-  {{ block.super }}
-  {% if homepage_url %}
-    <a href="{% url 'combo-manager-homepage' %}">{% trans 'Portal Management' %}</a>
-  {% endif %}
-{% endblock %}
-
-{% block logout-url %}{% url 'auth_logout' %}{% endblock %}
-
-{% block extrascripts %}
-<script src="/__services.js"></script>
-<script src="{% static "js/publik.js" %}"></script>
-
-<script src="{% static "ckeditor/ckeditor/ckeditor.js" %}"></script>
-<script type="text/javascript" src="{% static "ckeditor/ckeditor-init.js" %}"></script>
-<script src="{% static "js/combo.manager.js" %}"></script>
-{% endblock %}
diff --git a/data/themes/gadjo/templates/combo/page_template.html b/data/themes/gadjo/templates/combo/page_template.html
index d8ebaa5b..64fe4340 100644
--- a/data/themes/gadjo/templates/combo/page_template.html
+++ b/data/themes/gadjo/templates/combo/page_template.html
@@ -7,6 +7,7 @@
 
 {% block extrascripts %}
 <script src="/__services.js"></script>
+<script src="{% static "js/agent-portal.js" %}"></script>
 <script src="{% static "js/publik.js" %}"></script>
 {% endblock %}
 
@@ -16,23 +17,9 @@
 {% block logout-url %}{% url 'auth_logout' %}{% endblock %}
 
 {% block content %}
+<div id="portal-agent-content">
 {% block combo-content %}
 {% placeholder "content" %}
 {% endblock %}
-{% endblock %}
-
-{% block more-user-links %}
- <span id="breadcrumb">
- {% block breadcrumb %}
-  {% if manager_homepage_url %}
-    {% trans "Homepage" as default_manager_homepage_title %}
-    <a class="icon-home-space" href="{{ manager_homepage_url }}">
-      {% firstof manager_homepage_title default_manager_homepage_title %}
-    </a>
-    <a href="{% url 'homepage' %}">{% trans  'Home' %}</a>
-  {% else %}
-    <a href="" class="icon-home-space">{% trans 'Home' %}</a>
-  {% endif %}
- {% endblock %}
- </span>
+</div>
 {% endblock %}
diff --git a/data/themes/gadjo/templates/gadjo/base.html b/data/themes/gadjo/templates/gadjo/base.html
new file mode 100644
index 00000000..2e4ce05a
--- /dev/null
+++ b/data/themes/gadjo/templates/gadjo/base.html
@@ -0,0 +1,22 @@
+{% extends "gadjo/root.html" %}
+{% load i18n static %}
+
+{% block extrascripts %}
+<script src="/__services.js"></script>
+<script src="{% static "js/publik.js" %}"></script>
+{% endblock %}
+
+{% block more-user-links %}
+ <span id="breadcrumb">
+ {% block breadcrumb %}
+  {% if manager_homepage_url %}
+    {% trans "Portal Agent" as default_manager_homepage_title %}
+    <a href="{{ manager_homepage_url }}">
+      {% firstof manager_homepage_title default_manager_homepage_title %}
+    </a>
+  {% else %}
+    <a href="" class="icon-home-space">{% trans 'Home' %}</a>
+  {% endif %}
+ {% endblock %}
+ </span>
+{% endblock %}