Index: modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/client/NavigationManager.java
===================================================================
--- modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/client/NavigationManager.java	(revision 51029)
+++ modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/client/NavigationManager.java	(revision 51030)
@@ -32,11 +32,17 @@
 
         //TODO use role instead of email
         if(RepositoryManager.currentUserRole.equals("admin")) {
+            Document.get().getElementById("adminMenuHeader").getStyle().setDisplay(Style.Display.BLOCK);
+            Document.get().getElementById("adminMenuHelpTexts").getStyle().setDisplay(Style.Display.BLOCK);
+            Document.get().getElementById("adminMenuMetrics").getStyle().setDisplay(Style.Display.BLOCK);
+
             Document.get().getElementById("admin1").getStyle().setDisplay(Style.Display.BLOCK);
-            Document.get().getElementById("admin2").getStyle().setDisplay(Style.Display.BLOCK);
         } else {
+            Document.get().getElementById("adminMenuHeader").getStyle().setDisplay(Style.Display.NONE);
+            Document.get().getElementById("adminMenuHelpTexts").getStyle().setDisplay(Style.Display.NONE);
+            Document.get().getElementById("adminMenuMetrics").getStyle().setDisplay(Style.Display.NONE);
+
             Document.get().getElementById("admin1").getStyle().setDisplay(Style.Display.NONE);
-            Document.get().getElementById("admin2").getStyle().setDisplay(Style.Display.NONE);
         }
 
         RepositoryManager.previousToken = RepositoryManager.currentToken;
Index: modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/client/datasources/update/UpdateRepositoryWidget.java
===================================================================
--- modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/client/datasources/update/UpdateRepositoryWidget.java	(revision 51029)
+++ modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/client/datasources/update/UpdateRepositoryWidget.java	(revision 51030)
@@ -2,11 +2,17 @@
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.dom.client.Document;
+import com.google.gwt.event.dom.client.ClickEvent;
+import com.google.gwt.event.dom.client.ClickHandler;
+import com.google.gwt.query.client.Function;
+import com.google.gwt.user.client.Event;
+import com.google.gwt.user.client.Window;
 import com.google.gwt.user.client.rpc.AsyncCallback;
 import com.google.gwt.user.client.ui.FlowPanel;
 import com.google.gwt.user.client.ui.HTML;
 import com.google.gwt.user.client.ui.Widget;
 import eu.dnetlib.domain.data.Repository;
+import eu.dnetlib.domain.functionality.validator.JobResultEntry;
 import eu.dnetlib.gwt.client.help.HelpService;
 import eu.dnetlib.gwt.client.help.HelpServiceAsync;
 import eu.dnetlib.repo.manager.client.AbstractRepositoryManagerWidget;
@@ -13,12 +19,21 @@
 import eu.dnetlib.repo.manager.client.HelpCallback;
 import eu.dnetlib.repo.manager.client.RepositoryManager;
 import eu.dnetlib.repo.manager.client.RepositoryManagerWidget;
+import eu.dnetlib.repo.manager.client.enrichcontent.EventsSubscriptionForm;
 import eu.dnetlib.repo.manager.client.services.RepositoryService;
 import eu.dnetlib.repo.manager.client.services.RepositoryServiceAsync;
+import eu.dnetlib.repo.manager.client.widgets.*;
 import eu.dnetlib.repo.manager.shared.DatasourceVocabularies;
-import org.gwtbootstrap3.client.ui.Alert;
+import eu.dnetlib.repo.manager.shared.broker.OpenaireSubscription;
+import eu.dnetlib.repo.manager.shared.broker.Subscription;
+import org.gwtbootstrap3.client.ui.*;
+import org.gwtbootstrap3.client.ui.TextBox;
 import org.gwtbootstrap3.client.ui.constants.AlertType;
+import org.gwtbootstrap3.client.ui.constants.ButtonType;
+import org.gwtbootstrap3.client.ui.constants.ModalBackdrop;
 
+import static com.google.gwt.query.client.GQuery.$;
+
 /**
  * Created by stefania on 1/14/16.
  */
@@ -27,9 +42,11 @@
     private String parentToken = "";
     private String restToken = "";
 
+    private static HTML title = new HTML();
     private FlowPanel updateRepositoryBoxContent = new FlowPanel();
 
     private Alert errorAlert = new Alert();
+    private Alert successAlert = new Alert();
 
     private RepositoryServiceAsync repositoryService = GWT.create(RepositoryService.class);
     private static HelpServiceAsync helpService = GWT.create(HelpService.class);
@@ -36,7 +53,6 @@
 
     public UpdateRepositoryWidget() {
 
-        HTML title = new HTML("<h1 class=\"uk-article-title\">Update your datasource</h1>");
         title.addStyleName("uk-margin-medium-bottom");
         contentPanel.add(title);
 
@@ -45,6 +61,11 @@
         errorAlert.setVisible(false);
         updateRepositoryBoxContent.add(errorAlert);
 
+        successAlert.setType(AlertType.SUCCESS);
+        successAlert.setDismissable(false);
+        successAlert.setVisible(false);
+        updateRepositoryBoxContent.add(successAlert);
+
         contentPanel.add(updateRepositoryBoxContent);
     }
 
@@ -52,6 +73,7 @@
     public void clear() {
         updateRepositoryBoxContent.clear();
         errorAlert.setVisible(false);
+        successAlert.setVisible(false);
         gridPanel.remove(helpPanel);
     }
 
@@ -60,6 +82,7 @@
 
         Document.get().getElementById("headerNoTransparent").removeClassName("tm-header-transparent");
         updateRepositoryBoxContent.add(errorAlert);
+        updateRepositoryBoxContent.add(successAlert);
 
         final HTML loadingWheel = new HTML("<div class=\"loader-big\" style=\"text-align: center; padding-top: 170px; " +
                 "color: rgb(47, 64, 80); font-weight: bold;\">Retrieving repository...</div>" +
@@ -84,6 +107,17 @@
             @Override
             public void onSuccess(final Repository repository) {
 
+                String logoURLSource = "";
+                if(repository.getLogoUrl()==null || repository.getLogoUrl().isEmpty())
+                    logoURLSource = "img/yourLogoHere.jpg";
+                else
+                    logoURLSource = repository.getLogoUrl();
+
+                title.setHTML("<h1 class=\"uk-article-title\">" +
+                        "<a id=\"updateLogoURL\" href=\"javascript:;\">" +
+                        "<img src=\"" + logoURLSource + "\" alt=\"[Repo Logo]\" width=\"60px\" style=\"margin-right: 15px; margin-top:-8px\"></a>" +
+                        repository.getOfficialName() + "</h1>");
+
 //                RepositoryManager.pageHeader.clear();
 //
 //                String logoURLSource = "";
@@ -122,6 +156,8 @@
                         UpdateRepositoryForm updateRepositoryForm =
                                 new UpdateRepositoryForm(repository.getDatasourceType(), datasourceVocabularies, repository);
                         updateRepositoryBoxContent.add(updateRepositoryForm.asWidget());
+
+                        addHandlers(repository);
                     }
                 });
             }
@@ -138,4 +174,116 @@
     public void afterAdditionToRootPanel() {
 
     }
+
+    private void addHandlers(final Repository repository) {
+
+        $("#updateLogoURL").click(new Function() {
+
+            public boolean f(Event e) {
+
+                errorAlert.setVisible(false);
+                successAlert.setVisible(false);
+
+                openModalToEnterLogoURL(repository);
+
+                return true;
+            }
+        });
+    }
+
+    private void openModalToEnterLogoURL(final Repository repository) {
+
+        final Modal updateLogoURLModal = new Modal();
+        updateLogoURLModal.setDataBackdrop(ModalBackdrop.STATIC);
+
+        FlowPanel modalContent = new FlowPanel();
+
+        HTML title = new HTML("<h2 class=\"uk-modal-title\">Update Logo URL</h2>\n");
+        modalContent.add(title);
+
+        Form logoURLForm = new Form();
+
+        final TextBox logoURLTextBox = new TextBox();
+        if(repository.getLogoUrl()==null || repository.getLogoUrl().isEmpty())
+            logoURLTextBox.setPlaceholder("Logo URL");
+        else
+            logoURLTextBox.setValue(repository.getLogoUrl());
+
+        logoURLForm.addStyleName("uk-margin uk-grid");
+
+        FlowPanel logoURLTextBoxWrapper = new FlowPanel();
+        logoURLTextBoxWrapper.addStyleName("uk-width-1-1");
+        logoURLTextBoxWrapper.add(logoURLTextBox);
+        logoURLForm.add(logoURLTextBoxWrapper);
+
+        modalContent.add(logoURLForm);
+
+        FlowPanel actionButtons = new FlowPanel();
+        actionButtons.addStyleName("uk-text-right uk-margin-bottom");
+        modalContent.add(actionButtons);
+
+        Button no = new Button("Cancel");
+        no.addStyleName("uk-button uk-button-default");
+        no.addClickHandler(new ClickHandler() {
+            @Override
+            public void onClick(ClickEvent event) {
+                updateLogoURLModal.hide();
+                updateLogoURLModal.removeFromParent();
+            }
+        });
+        actionButtons.add(no);
+
+        Button yes = new Button("Update");
+        yes.addStyleName("uk-button uk-button-primary");
+        yes.addClickHandler(new ClickHandler() {
+            @Override
+            public void onClick(ClickEvent event) {
+
+                repository.setLogoUrl(logoURLTextBox.getValue().trim());
+                repositoryService.updateRepositoryInformation(repository, new AsyncCallback<Void>() {
+
+                    @Override
+                    public void onFailure(Throwable throwable) {
+
+                        errorAlert.setText("System error updating logo URL");
+                        errorAlert.setVisible(true);
+
+                        updateLogoURLModal.hide();
+                        updateLogoURLModal.removeFromParent();
+                    }
+
+                    @Override
+                    public void onSuccess(Void aVoid) {
+
+                        successAlert.setVisible(true);
+                        successAlert.setText("Logo updated successfully");
+
+                        String logoURLSource = "";
+                        if(repository.getLogoUrl()==null || repository.getLogoUrl().isEmpty())
+                            logoURLSource = "img/yourLogoHere.jpg";
+                        else
+                            logoURLSource = repository.getLogoUrl();
+
+                        UpdateRepositoryWidget.title.setHTML("<h1 class=\"uk-article-title\">" +
+                                "<a id=\"updateLogoURL\" href=\"javascript:;\">" +
+                                "<img src=\"" + logoURLSource + "\" alt=\"[Repo Logo]\" width=\"60px\" style=\"margin-right: 15px; margin-top:-8px\"></a>" +
+                                repository.getOfficialName() + "</h1>");
+
+                        addHandlers(repository);
+
+                        updateLogoURLModal.hide();
+                        updateLogoURLModal.removeFromParent();
+                    }
+                });
+            }
+        });
+        actionButtons.add(yes);
+
+        ModalBody modalBody = new ModalBody();
+        modalBody.add(modalContent);
+        updateLogoURLModal.add(modalBody);
+        updateLogoURLModal.getElement().getChild(0).getChild(0).getChild(0).removeFromParent();
+
+        updateLogoURLModal.show();
+    }
 }
Index: modules/uoa-repository-manager-gui/branches/aai/src/main/resources/eu/dnetlib/repo/manager/server/springContext-repo-manager.properties
===================================================================
--- modules/uoa-repository-manager-gui/branches/aai/src/main/resources/eu/dnetlib/repo/manager/server/springContext-repo-manager.properties	(revision 51029)
+++ modules/uoa-repository-manager-gui/branches/aai/src/main/resources/eu/dnetlib/repo/manager/server/springContext-repo-manager.properties	(revision 51030)
@@ -1,65 +1,65 @@
-# the address where validator is running and is accessible from the rest of the web
-services.repo-manager.baseUrl = http://${container.hostname}:${container.port}/${container.context}
+## the address where validator is running and is accessible from the rest of the web
+#services.repo-manager.baseUrl = http://${container.hostname}:${container.port}/${container.context}
+#
+## base address for soap web services
+#transport.soap.baseAddress = http://${container.hostname}:${container.port}/${container.context}
+#
+#transport.soap.force.local.address = false
+#
+## the email of the administrator
+## he will receive all the automatic bug reports and feedback created
+#services.repo-manager.adminEmail = nikonas@di.uoa.gr
+#
+## if set to true, getRepositories will return dummy repositories
+#services.repo-manager.repository.testing.mode = false
+#
+#services.repo-manager.deploy.environment = development
+#
+## the mailhost for the mail service
+#services.validator.mail.host = smtp.gmail.com
+## the port where the mail service is running
+#services.validator.mail.port = 465
+## the address that appears in the from field in the mails send by the validator
+#services.validator.mail.fromAddress = no-reply@openaire.eu
+## the reply-to field value in the mails send by the validator
+#services.validator.mail.replyToAddress = no-reply@openaire.eu
+## the username of the account used to login in the mail server
+#services.validator.mail.username = test.openaire@gmail.com
+## the password of the account used to login in the mail server
+#services.validator.mail.password = ^($*@$)*!$
+## if authentication should take place
+## if set to false username and password is not needed
+#services.validator.mail.authenticate = true
+## is set to yes then all mails will not be sent to their targets but to the address specified in services.validator.mail.overrideEmail
+#services.validator.mail.override = false
+## if set to true then no mails are send, they are only logged as a debug message
+#services.validator.mail.logonly = false
+## the mode used for the mails send by the validator
+#services.validator.mail.mode = ssl
+## used by eu.dnetlib.utils.MailLibrary to control debuggin messages
+#services.validator.mail.debug = false
+## if services.validator.mail.override is true then all mails will be send only to this address
+#services.validator.mail.overrideEmail = nikonas@di.uoa.gr
+## a comma-seperated list of address that will receive all mails about validations and repo registrations
+#services.validator.mail.specialRecipients = nikonas@di.uoa.gr
+#
+## a comma-seperated list of addresses that have the ability to register repos without the need for validation and registration
+#services.validator.repoRegistration.override = nikonas@di.uoa.gr
+#
+#
+#repomanager.db.driverClassName = org.postgresql.Driver
+#repomanager.db.url = jdbc:postgresql://194.177.192.119:5432/repomanager
+#repomanager.db.username = dnet
+#repomanager.db.password = dnetPwd
+#
+#services.repomanager.analyticsURL = https://analytics.openaire.eu/addsite.php?
+#
+#services.repomanager.usageStatisticsDiagramsBaseURL = https://beta.openaire.eu/stats3/
+#services.repomanager.usageStatisticsNumbersBaseURL = https://beta.services.openaire.eu/usagestats/datasources/
+#services.repomanager.usagestats.adminEmail = repositoryusagestats@openaire.eu
 
-# base address for soap web services
-transport.soap.baseAddress = http://${container.hostname}:${container.port}/${container.context}
-
-transport.soap.force.local.address = false
-
-# the email of the administrator
-# he will receive all the automatic bug reports and feedback created
-services.repo-manager.adminEmail = nikonas@di.uoa.gr
-
-# if set to true, getRepositories will return dummy repositories
-services.repo-manager.repository.testing.mode = false
-
-services.repo-manager.deploy.environment = development
-
-# the mailhost for the mail service
-services.validator.mail.host = smtp.gmail.com
-# the port where the mail service is running
-services.validator.mail.port = 465
-# the address that appears in the from field in the mails send by the validator
-services.validator.mail.fromAddress = no-reply@openaire.eu
-# the reply-to field value in the mails send by the validator
-services.validator.mail.replyToAddress = no-reply@openaire.eu
-# the username of the account used to login in the mail server
-services.validator.mail.username = test.openaire@gmail.com
-# the password of the account used to login in the mail server
-services.validator.mail.password = ^($*@$)*!$
-# if authentication should take place
-# if set to false username and password is not needed
-services.validator.mail.authenticate = true
-# is set to yes then all mails will not be sent to their targets but to the address specified in services.validator.mail.overrideEmail
-services.validator.mail.override = false
-# if set to true then no mails are send, they are only logged as a debug message
-services.validator.mail.logonly = false
-# the mode used for the mails send by the validator
-services.validator.mail.mode = ssl
-# used by eu.dnetlib.utils.MailLibrary to control debuggin messages
-services.validator.mail.debug = false
-# if services.validator.mail.override is true then all mails will be send only to this address
-services.validator.mail.overrideEmail = nikonas@di.uoa.gr
-# a comma-seperated list of address that will receive all mails about validations and repo registrations
-services.validator.mail.specialRecipients = nikonas@di.uoa.gr
-
-# a comma-seperated list of addresses that have the ability to register repos without the need for validation and registration
-services.validator.repoRegistration.override = nikonas@di.uoa.gr
-
-
-repomanager.db.driverClassName = org.postgresql.Driver
-repomanager.db.url = jdbc:postgresql://194.177.192.119:5432/repomanager
-repomanager.db.username = dnet
-repomanager.db.password = dnetPwd
-
-services.repomanager.analyticsURL = https://analytics.openaire.eu/addsite.php?
-
-services.repomanager.usageStatisticsDiagramsBaseURL = https://beta.openaire.eu/stats3/
-services.repomanager.usageStatisticsNumbersBaseURL = https://beta.services.openaire.eu/usagestats/datasources/
-services.repomanager.usagestats.adminEmail = repositoryusagestats@openaire.eu
-
 oidc.issuer = https://aai.openminted.eu/oidc/
 oidc.id = 24e83176-1312-4ba3-bc0b-ffeebea1603e
 oidc.secret = U_gLOupYu2trYIOwfxGgZkkZoOHG_zGfaViOUsXcZ7qVQuF1rcJeQYKIDX1TY3z27CIoHaqq9ht2rmAiUmBRYQ
-webapp.home = http://localhost:8380/uoa-repository-manager-gui/openid_connect_login
-webapp.front=http://localhost:8380/uoa-repository-manager-gui/#dashboard
\ No newline at end of file
+webapp.home = http://beta.services.openaire.eu:8380/provider-user-management/openid_connect_login
+webapp.front=http://localhost:8380/repomanager-aai/#dashboard
\ No newline at end of file
Index: modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/server/services/RepositoryServiceImpl.java
===================================================================
--- modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/server/services/RepositoryServiceImpl.java	(revision 51029)
+++ modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/server/services/RepositoryServiceImpl.java	(revision 51030)
@@ -1,9 +1,6 @@
 package eu.dnetlib.repo.manager.server.services;
 
-import com.fasterxml.jackson.databind.DeserializationConfig;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException;
-import com.unboundid.util.Base64;
 import eu.dnetlib.domain.data.PiwikInfo;
 import eu.dnetlib.domain.data.Repository;
 import eu.dnetlib.domain.data.RepositoryInterface;
@@ -13,7 +10,6 @@
 import eu.dnetlib.repo.manager.client.services.RepositoryService;
 import eu.dnetlib.repo.manager.server.utils.EmailUtils;
 import eu.dnetlib.repo.manager.server.utils.LocalVocabularies;
-import eu.dnetlib.domain.data.PiwikInfo;
 import eu.dnetlib.repo.manager.service.controllers.RepositoryApi;
 import eu.dnetlib.repo.manager.shared.*;
 import eu.dnetlib.repos.RepoApi;
@@ -23,7 +19,6 @@
 import org.apache.commons.lang.WordUtils;
 import org.apache.log4j.Logger;
 import org.json.JSONException;
-import org.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.ParameterizedTypeReference;
@@ -41,7 +36,6 @@
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
-import java.text.Normalizer;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.net.URL;
@@ -722,4 +716,9 @@
 
         return null;
     }
+
+    @Override
+    public Aggregations getRepositoryAggregations(String repoId) throws Exception {
+        return repositoryApi.getRepositoryAggregations(repoId);
+    }
 }
\ No newline at end of file
Index: modules/uoa-repository-manager-gui/branches/aai/src/main/webapp/RepositoryManager.html
===================================================================
--- modules/uoa-repository-manager-gui/branches/aai/src/main/webapp/RepositoryManager.html	(revision 51029)
+++ modules/uoa-repository-manager-gui/branches/aai/src/main/webapp/RepositoryManager.html	(revision 51030)
@@ -47,6 +47,8 @@
             integrity="sha256-hwg4gsxgFZhOsEEamdOYGBf13FyQuiTwlAQgxVSNgt4=" crossorigin="anonymous"></script>
     <script src="uikit-3/js/uikit.min.js"></script>
 
+    <script src="uikit-3/js/uikit-icons.min.js"></script>
+
     <script src="js/theme.js"></script>
 
     <link rel="icon" type="image/png" href="img/favicon.ico">
@@ -428,7 +430,7 @@
 
                             <ul class="uk-navbar-nav">
                                 <li class="uk-parent">
-                                    <a class="loginLink" href="/uoa-repository-manager-gui/openid_connect_login">
+                                    <a class="loginLink" href="/repomanager-aai/openid_connect_login">
                                         <span class="uk-margin-small-right uk-icon"><svg height="20" ratio="1" viewBox="0 0 20 20" width="20" xmlns="http://www.w3.org/2000/svg"><circle cx="9.9" cy="6.4" fill="none" r="4.4" stroke="#000" stroke-width="1.1"></circle><path d="M1.5,19 C2.3,14.5 5.8,11.2 10,11.2 C14.2,11.2 17.7,14.6 18.5,19.2" fill="none" stroke="#000" stroke-width="1.1"></path></svg>
                                         </span>
                                          Sign in | Register
@@ -1370,7 +1372,7 @@
                         <div>
                             <div class="uk-panel" id="module-0">
                                 <ul class="uk-nav uk-nav-default">
-                                    <li class="uk-nav-header uk-parent"><a href="#dashboard">Home</a>
+                                    <li class="uk-nav-header uk-parent"><a href="#dashboard">Dashboard</a>
                                     </li>
                                     <li class="uk-nav-header uk-parent">Sources
                                         <ul class="uk-nav-sub">
@@ -1388,10 +1390,10 @@
                                                 <a href="#validate">Validate</a>
                                             </li>
                                             <li>
-                                                <a href="#browseHistory">Browse History</a>
+                                                <a href="#browseHistory">Validation History</a>
                                             </li>
                                             <li>
-                                                <a href="#monitor">Monitor</a>
+                                                <a href="#monitor">Collection Monitor</a>
                                             </li>
                                         </ul>
                                     </li>
@@ -1492,7 +1494,7 @@
                         </div>
                         <div class="uk-navbar-center">
                             <ul class="uk-navbar-nav">
-                                <li class=""><a href="#dashboard" class="" aria-expanded="false">Home</a>
+                                <li class=""><a href="#dashboard" class="" aria-expanded="false">Dashboard</a>
                                 </li>
                                 <li class="uk-parent"><a href="#" class="" aria-expanded="false">Sources</a>
 
@@ -1525,10 +1527,10 @@
                                                         <a href="#validate">Validate</a>
                                                     </li>
                                                     <li>
-                                                        <a href="#browseHistory">Browse History</a>
+                                                        <a href="#browseHistory">Validation History</a>
                                                     </li>
                                                     <li>
-                                                        <a href="#monitor">Monitor</a>
+                                                        <a href="#monitor">Collection Monitor</a>
                                                     </li>
                                                 </ul>
                                             </div>
@@ -1556,25 +1558,25 @@
                                 </li>
                                 <li class=""><a href="#getImpact" class="" aria-expanded="false">Metrics</a>
                                 </li>
-                                <li id="admin2" class="uk-parent adminMenu" style="display: none;"><a href="#" class="" aria-expanded="false">Admin</a>
+                                <!--<li id="admin2" class="uk-parent adminMenu" style="display: none;"><a href="#" class="" aria-expanded="false">Admin</a>-->
 
-                                    <div class="uk-navbar-dropdown uk-navbar-dropdown-bottom-left"
-                                         style="top: 80px; left: 0px;">
-                                        <div class="uk-navbar-dropdown-grid uk-child-width-1-1 uk-grid uk-grid-stack"
-                                             uk-grid="">
-                                            <div class="uk-first-column">
-                                                <ul class="uk-nav uk-navbar-dropdown-nav">
-                                                    <li class="helpAdminMenu">
-                                                        <a href="#admin/helpTexts">Help Texts</a>
-                                                    </li>
-                                                    <li class="metricsAdminMenu">
-                                                        <a href="#admin/metrics">Metrics</a>
-                                                    </li>
-                                                </ul>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </li>
+                                    <!--<div class="uk-navbar-dropdown uk-navbar-dropdown-bottom-left"-->
+                                         <!--style="top: 80px; left: 0px;">-->
+                                        <!--<div class="uk-navbar-dropdown-grid uk-child-width-1-1 uk-grid uk-grid-stack"-->
+                                             <!--uk-grid="">-->
+                                            <!--<div class="uk-first-column">-->
+                                                <!--<ul class="uk-nav uk-navbar-dropdown-nav">-->
+                                                    <!--<li class="helpAdminMenu">-->
+                                                        <!--<a href="#admin/helpTexts">Help Texts</a>-->
+                                                    <!--</li>-->
+                                                    <!--<li class="metricsAdminMenu">-->
+                                                        <!--<a href="#admin/metrics">Metrics</a>-->
+                                                    <!--</li>-->
+                                                <!--</ul>-->
+                                            <!--</div>-->
+                                        <!--</div>-->
+                                    <!--</div>-->
+                                <!--</li>-->
                             </ul>
 
                         </div>
@@ -1591,7 +1593,16 @@
                                         <div class="uk-navbar-dropdown-grid uk-child-width-1-1 uk-grid uk-grid-stack" uk-grid="">
                                             <div class="uk-first-column">
                                                 <ul class="uk-nav uk-navbar-dropdown-nav">
-                                                    <li><a class="logoutLink loginLink" href="#landing">Log out</a></li>
+                                                    <li id="adminMenuHeader" class="uk-nav-header">Admin</li>
+                                                    <li id="adminMenuHelpTexts">
+                                                        <a href="#admin/helpTexts">Help Texts</a>
+                                                    </li>
+                                                    <li id="adminMenuMetrics" class="uk-margin-small-bottom">
+                                                        <a href="#admin/metrics">Metrics</a>
+                                                    </li>
+                                                    <li>
+                                                        <a class="logoutLink loginLink" href="#landing">Log out</a>
+                                                    </li>
                                                 </ul>
                                             </div>
                                         </div>
Index: modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/server/services/BrokerServiceImpl.java
===================================================================
--- modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/server/services/BrokerServiceImpl.java	(revision 51029)
+++ modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/server/services/BrokerServiceImpl.java	(revision 51030)
@@ -9,6 +9,7 @@
 import eu.dnetlib.repo.manager.service.controllers.RepositoryApi;
 import eu.dnetlib.repo.manager.shared.BrokerException;
 import eu.dnetlib.repo.manager.shared.RepositoryServiceException;
+import eu.dnetlib.repo.manager.shared.Term;
 import eu.dnetlib.repo.manager.shared.Tuple;
 import eu.dnetlib.repo.manager.shared.broker.*;
 import eu.dnetlib.repos.RepoApi;
@@ -165,8 +166,8 @@
     }
 
     @Override
-    public Map<String, List<SimpleSubscriptionDesc>> getSubscriptionsOfUser(String userEmail) throws BrokerException {
-        return brokerApi.getSubscriptionsOfUser(userEmail);
+    public Map<String, List<SimpleSubscriptionDesc>> getSimpleSubscriptionsOfUser(String userEmail) throws BrokerException {
+        return brokerApi.getSimpleSubscriptionsOfUser(userEmail);
     }
 
     @Override
@@ -191,6 +192,10 @@
         }
     }
 
+    public Map<String,Term> getDnetTopics() throws BrokerException {
+        return brokerApi.getDnetTopics();
+    }
+
     /**
      * Helper class to aggregate the datasources topic sizes by datasource name.
      *
@@ -224,4 +229,15 @@
 
         return entries;
     }
+
+    @Override
+    public EventsPage getNotificationsBySubscriptionId(String subscriptionId,String page,String size) throws BrokerException {
+        return brokerApi.getNotificationsBySubscriptionId(subscriptionId,page,size);
+    }
+
+    @Override
+    public Map<String, List<Subscription>> getSubscriptionsOfUser(String userEmail) throws BrokerException {
+        return brokerApi.getSubscriptionsOfUser(userEmail);
+    }
+
 }
Index: modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/shared/broker/NotificationMode.java
===================================================================
--- modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/shared/broker/NotificationMode.java	(revision 51029)
+++ modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/shared/broker/NotificationMode.java	(revision 51030)
@@ -6,5 +6,5 @@
  * Created by stefanos on 10-Mar-17.
  */
 public enum NotificationMode implements IsSerializable {
-    MOCK, EMAIL
+    EMAIL
 }
\ No newline at end of file
Index: modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/shared/Term.java
===================================================================
--- modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/shared/Term.java	(nonexistent)
+++ modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/shared/Term.java	(revision 51030)
@@ -0,0 +1,56 @@
+package eu.dnetlib.repo.manager.shared;
+
+import com.google.gwt.user.client.rpc.IsSerializable;
+
+/**
+ * Created by panagiotis on 15/1/2018.
+ */
+public class Term implements IsSerializable {
+
+    public String englishName;
+    public String nativeName;
+    public String encoding;
+    public String code;
+
+    public Term() {
+    }
+
+    public Term(String englishName, String nativeName, String encoding, String code) {
+        this.englishName = englishName;
+        this.nativeName = nativeName;
+        this.encoding = encoding;
+        this.code = code;
+    }
+
+    public String getEnglishName() {
+        return englishName;
+    }
+
+    public void setEnglishName(String englishName) {
+        this.englishName = englishName;
+    }
+
+    public String getNativeName() {
+        return nativeName;
+    }
+
+    public void setNativeName(String nativeName) {
+        this.nativeName = nativeName;
+    }
+
+    public String getEncoding() {
+        return encoding;
+    }
+
+    public void setEncoding(String encoding) {
+        this.encoding = encoding;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+}
Index: modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/shared/Aggregations.java
===================================================================
--- modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/shared/Aggregations.java	(nonexistent)
+++ modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/shared/Aggregations.java	(revision 51030)
@@ -0,0 +1,40 @@
+package eu.dnetlib.repo.manager.shared;
+
+import com.google.gwt.user.client.rpc.IsSerializable;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class Aggregations implements IsSerializable{
+
+    private List<AggregationDetails> aggregationHistory = new ArrayList<>();
+    private AggregationDetails lastCollection;
+    private AggregationDetails lastTransformation;
+
+    public Aggregations() {
+    }
+
+    public List<AggregationDetails> getAggregationHistory() {
+        return aggregationHistory;
+    }
+
+    public void setAggregationHistory(List<AggregationDetails> aggregationHistory) {
+        this.aggregationHistory = aggregationHistory;
+    }
+
+    public AggregationDetails getLastCollection() {
+        return lastCollection;
+    }
+
+    public void setLastCollection(AggregationDetails lastCollection) {
+        this.lastCollection = lastCollection;
+    }
+
+    public AggregationDetails getLastTransformation() {
+        return lastTransformation;
+    }
+
+    public void setLastTransformation(AggregationDetails lastTransformation) {
+        this.lastTransformation = lastTransformation;
+    }
+}
Index: modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/shared/AggregationDetails.java
===================================================================
--- modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/shared/AggregationDetails.java	(nonexistent)
+++ modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/shared/AggregationDetails.java	(revision 51030)
@@ -0,0 +1,49 @@
+package eu.dnetlib.repo.manager.shared;
+
+import com.google.gwt.user.client.rpc.IsSerializable;
+
+import java.util.Date;
+
+public class AggregationDetails implements IsSerializable{
+
+
+    private String aggregationStage;
+    private Date date;
+    private int numberOfRecords;
+    private String collectionMode;
+
+    public AggregationDetails() {
+    }
+
+    public String getAggregationStage() {
+        return aggregationStage;
+    }
+
+    public String getCollectionMode() {
+        return collectionMode;
+    }
+
+    public void setCollectionMode(String collectionMode) {
+        this.collectionMode = collectionMode;
+    }
+
+    public void setAggregationStage(String aggregationStage) {
+        this.aggregationStage = aggregationStage;
+    }
+
+    public Date getDate() {
+        return date;
+    }
+
+    public void setDate(Date date) {
+        this.date = date;
+    }
+
+    public int getNumberOfRecords() {
+        return numberOfRecords;
+    }
+
+    public void setNumberOfRecords(int numberOfRecords) {
+        this.numberOfRecords = numberOfRecords;
+    }
+}
Index: modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/client/browsehistory/ViewJobDetailsWidget.java
===================================================================
--- modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/client/browsehistory/ViewJobDetailsWidget.java	(revision 51029)
+++ modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/client/browsehistory/ViewJobDetailsWidget.java	(revision 51030)
@@ -41,6 +41,7 @@
     private String parentToken = "";
     private String restToken = "";
 
+    private HTML title = new HTML();
     private FlowPanel viewJobDetailsBoxContent = new FlowPanel();
 
     private Alert errorAlert = new Alert();
@@ -59,9 +60,12 @@
 
         super();
 
-        HTML title = new HTML("<h1 class=\"uk-article-title\">Job details</h1>");
+
         title.addStyleName("uk-margin-medium-bottom");
         contentPanel.add(title);
+//        HTML title = new HTML("<h1 class=\"uk-article-title\">Validation results for</h1>");
+//        title.addStyleName("uk-margin-medium-bottom");
+//        contentPanel.add(title);
 
         contentPanel.add(viewJobDetailsBoxContent);
 
@@ -111,6 +115,9 @@
 
                 ViewJobDetailsWidget.this.storedJob = storedJob;
 
+//                title.setHTML("<h1 class=\"uk-article-title\">Validation results for " + storedJob.getOfficialName() + "</h1>");
+                title.setHTML("<h1 class=\"uk-article-title\">Validation results for</h1>");
+
                 viewJobDetailsBoxContent.removeStyleName("loading-big");
                 viewJobDetailsBoxContent.remove(loadingWheel);
 
@@ -140,7 +147,7 @@
 
         String content = "<h4 class=\"uk-h4 uk-text-primary uk-scrollspy-inview uk-animation-slide-top-medium\"" +
                 "uk-scrollspy-class=\"\"><span>" + storedJob.getBaseUrl() + "</span></h4>" +
-                "<div class=\"uk-margin\">by " + storedJob.getUserEmail() + "</div>";
+                "<div class=\"uk-margin-small\">by " + storedJob.getUserEmail() + "</div>";
 
 
         generalInfoItem.add(new HTML(content));
@@ -152,15 +159,21 @@
         FlowPanel generalInfoTags = new FlowPanel();
 
         String content = "<hr class=\"uk-scrollspy-inview uk-animation-slide-bottom-small\" uk-scrollspy-class=\"\">" +
-                "<div class=\"tags\">" +
-                "<span class=\"label label-primary\">" + storedJob.getJobType() + "</span>" +
-                "<span class=\"label label-primary\">" + storedJob.getGuidelinesShortName() + "</span>" +
-                "<span class=\"label label-primary\">Validation set: " + storedJob.getValidationSet() + "</span>" +
-                "<span class=\"label label-primary\">Started: " + storedJob.getStarted() + "</span>" +
-                "<span class=\"label label-primary\">Ended: " + storedJob.getEnded() + "</span>" +
-                "<span class=\"label label-primary\">Duration: " + storedJob.getDuration() + "</span>" +
-                "<span class=\"label label-primary\">Records tested: " + storedJob.getRecordsTested() + "</span>" +
-                "<span class=\"label label-primary\">Score for content: " + storedJob.getContentJobScore() + "</span>" +
+                "<div>" +
+                "<span class=\"\">" + storedJob.getJobType() + "</span> | " +
+                "<span class=\"\">" + storedJob.getGuidelinesShortName() + "</span> | " +
+                "<span class=\"\">Validation set: " + storedJob.getValidationSet() + "</span>" +
+                "</div>" +
+                "<div>" +
+                "<span class=\"\">Started: " + storedJob.getStarted() + "</span>, " +
+                "<span class=\"\">Ended: " + storedJob.getEnded() + "</span>, " +
+                "<span class=\"\">Duration: " + storedJob.getDuration() + "</span>" +
+                "</div>" +
+                "<div style=\"font-size: 120%\">" +
+                "<span class=\"\">Records tested: " + storedJob.getRecordsTested() + "</span>" +
+                "</div>" +
+                "<div>" +
+                "<span class=\"label label-primary uk-margin-right\">Score for content: " + storedJob.getContentJobScore() + "</span>" +
                 "<span class=\"label label-primary\">Score for usage: " + storedJob.getUsageJobScore() + "</span>" +
                 "</div>" +
                 "<hr class=\"uk-scrollspy-inview uk-animation-slide-bottom-small\" uk-scrollspy-class=\"\">";
@@ -253,7 +266,7 @@
         String content = "<table class=\"uk-table uk-table-striped uk-table-middle rules-table\">" +
                 "<thead><tr><th>Rule Name</th><th class=\"uk-text-nowrap\">Rule Description</th>" +
                 "<th class=\"uk-text-nowrap\">Rule Weight</th><th class=\"uk-text-nowrap\"># of records</th>" +
-                "<th class=\"uk-text-nowrap\">Success</th></tr></thead>";
+                "<th class=\"uk-text-nowrap\">Status</th></tr></thead>";
 
         content += "<tbody>";
 
@@ -283,13 +296,22 @@
                         "<td class=\"uk-table-shrink\">\n";
 
                 if (jobResults.get(i).isHasErrors() && jobResults.get(i).isMandatory()) {
-                    content += "<img src=\"img/icon_colours-x.jpg\" alt=\"Error\" class=\"el-image uk-preserve-width\" width=\"20\">" +
+
+                    content += "<span uk-icon=\"icon: close\" style=\"color: #cd242b\"></span>" +
                             "<a href=\"javascript:;\" class=\"errorlink viewErrors uk-display-block\" id=\"" + jobResults.get(i).getType() + "#" + i + "\"><span>View Errors</span></a>";
+//                    content += "<img src=\"img/icon_colours-x.jpg\" alt=\"Error\" class=\"el-image uk-preserve-width\" width=\"20\">" +
+//                            "<a href=\"javascript:;\" class=\"errorlink viewErrors uk-display-block\" id=\"" + jobResults.get(i).getType() + "#" + i + "\"><span>View Errors</span></a>";
+
                 } else if (jobResults.get(i).isHasErrors() && !jobResults.get(i).isMandatory()) {
-                    content += "<img src=\"img/icon_colours-warning.jpg\" alt=\"Warning\" class=\"el-image uk-preserve-width\" width=\"20\">" +
+
+                    content += "<span uk-icon=\"icon: warning\" style=\"color: #e9d60d\"></span>" +
                             "<a href=\"javascript:;\" class=\"warninglink viewErrors uk-display-block\" id=\"" + jobResults.get(i).getType() + "#" + i + "\"><span>View Warnings</span></a>";
+//                    content += "<img src=\"img/icon_colours-warning.jpg\" alt=\"Warning\" class=\"el-image uk-preserve-width\" width=\"20\">" +
+//                            "<a href=\"javascript:;\" class=\"warninglink viewErrors uk-display-block\" id=\"" + jobResults.get(i).getType() + "#" + i + "\"><span>View Warnings</span></a>";
+
                 } else
-                    content += "<img src=\"img/icon_colours-check.jpg\" alt=\"Success\" class=\"el-image uk-preserve-width\" width=\"20\">";
+                    content += "<span uk-icon=\"icon: check\" style=\"color: #4b991f\"></span>" ;
+//                    content += "<img src=\"img/icon_colours-check.jpg\" alt=\"Success\" class=\"el-image uk-preserve-width\" width=\"20\">";
 
                 content += "</td>" +
                         "</tr>";
Index: modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/client/browsehistory/BrowseHistoryWidget.java
===================================================================
--- modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/client/browsehistory/BrowseHistoryWidget.java	(revision 51029)
+++ modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/client/browsehistory/BrowseHistoryWidget.java	(revision 51030)
@@ -8,6 +8,7 @@
 import com.google.gwt.event.dom.client.ClickHandler;
 import com.google.gwt.query.client.Function;
 import com.google.gwt.user.client.Event;
+import com.google.gwt.user.client.Window;
 import com.google.gwt.user.client.rpc.AsyncCallback;
 import com.google.gwt.user.client.ui.FlowPanel;
 import com.google.gwt.user.client.ui.HTML;
@@ -304,6 +305,8 @@
                 updateContents(jobsOfUser.getJobs());
                 drawPager(bottomPagerPanel);
 //                drawBottomPager();
+
+                Window.scrollTo(0, 0);
             }
         });
     }
@@ -678,16 +681,20 @@
 
                     contents += "<td class=\"uk-table-shrink\" rowspan=\"2\"><div class=\"el-link actions\" href=\"#\">" +
                             "<div class=\"viewDetailsLinkWrapper\"><a href=\"#" + parentToken + "/" + storedJob.getId() + "\"  id=\"" + storedJob.getId() +
-                            "#viewDetails\" class=\"viewDetails\">View Results<i class=\"fa fa-info\"></i><i class=\"fa fa-angle-right\"></i></a></div>" +
-                            "<div><a id=\"" + storedJob.getId() + "#resubmit\" class=\"uk-button uk-button-primary resubmitJob\"><i></i>Resubmit</a></div>" +
+                            "#viewDetails\" class=\"viewDetails\">View Results<i class=\"fa fa-angle-right\"></i></a></div>" +
+                            "<div><a id=\"" + storedJob.getId() + "#resubmit\" class=\"resubmitJob\">Resubmit<i class=\"fa fa-repeat\" aria-hidden=\"true\"></i>" +
+                            "</a></div>" +
                             "</div></td>";
 
                     if(storedJob.getValidationStatus().equals(Constants.VALIDATION_JOB_STATUS_SUCCESSFUL))
                         contents += "<td class=\"uk-table-shrink\" rowspan=\"2\"><input width=\"20\" type=\"image\" height=\"20\" " +
-                                "title=\"Successfull\" src=\"icon_colours-check.jpg\"></td>";
+                                "title=\"Successfull\" src=\"img/icon_colours-check.jpg\"></td>";
                     else if(storedJob.getValidationStatus().equals(Constants.VALIDATION_JOB_STATUS_FAILED))
                         contents += "<td class=\"uk-table-shrink\" rowspan=\"2\"><input width=\"20\" type=\"image\" height=\"20\" " +
-                                "title=\"Successfull\" src=\"icon_colours-x.jpg\"></td>";
+                                "title=\"Successfull\" src=\"img/icon_colours-x.jpg\"></td>";
+                    else if(storedJob.getValidationStatus().equals(Constants.VALIDATION_JOB_STATUS_ONGOING))
+                        contents += "<td class=\"uk-table-shrink\" rowspan=\"2\"><input width=\"20\" type=\"image\" height=\"20\" " +
+                                "title=\"Ongoing\" src=\"img/icon_colours-question.jpg\"></td>";
 //                    else
 //                        contents += "<td rowspan=\"2\"><input width=\"20\" type=\"image\" height=\"20\" " +
 //                                "title=\"Successfull\" src=\"img/check-icon.png\"></td>";
Index: modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/client/services/RepositoryService.java
===================================================================
--- modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/client/services/RepositoryService.java	(revision 51029)
+++ modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/client/services/RepositoryService.java	(revision 51030)
@@ -7,6 +7,7 @@
 import eu.dnetlib.domain.data.RepositoryInterface;
 import eu.dnetlib.domain.functionality.UserProfile;
 import eu.dnetlib.repo.manager.shared.*;
+import org.json.JSONException;
 
 import java.util.List;
 import java.util.Map;
@@ -66,4 +67,7 @@
     void markPiwikSiteAsValidated(String repositoryId) throws RepositoryServiceException;
 
     MetricsInfo getMetricsInfoForRepository(String repoId) throws RepositoryServiceException;
+
+
+    Aggregations getRepositoryAggregations(String repoId) throws Exception;
 }
Index: modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/client/services/BrokerService.java
===================================================================
--- modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/client/services/BrokerService.java	(revision 51029)
+++ modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/client/services/BrokerService.java	(revision 51030)
@@ -3,6 +3,7 @@
 import com.google.gwt.user.client.rpc.RemoteService;
 import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
 import eu.dnetlib.repo.manager.shared.BrokerException;
+import eu.dnetlib.repo.manager.shared.Term;
 import eu.dnetlib.repo.manager.shared.broker.*;
 import org.json.JSONException;
 
@@ -23,8 +24,10 @@
 
     DatasourcesBroker getDatasourcesOfUser(String userEmail, boolean includeShared, boolean includeByOthers) throws BrokerException;
 
-    Map<String, List<SimpleSubscriptionDesc>> getSubscriptionsOfUser(String userEmail) throws BrokerException;
+    Map<String, List<SimpleSubscriptionDesc>> getSimpleSubscriptionsOfUser(String userEmail) throws BrokerException;
 
+    Map<String, List<Subscription>> getSubscriptionsOfUser(String userEmail) throws BrokerException;
+
     Subscription subscribe(OpenaireSubscription obj) throws BrokerException;
 
     void unsubscribe(String subscriptionId) throws BrokerException;
@@ -32,4 +35,8 @@
     void unsubscribe(List<String> subscriptionIds) throws BrokerException;
 
     Subscription getSubscription(String subscriptionId) throws BrokerException;
+
+    Map<String,Term> getDnetTopics() throws BrokerException;
+
+    EventsPage getNotificationsBySubscriptionId(String subscriptionId, String page, String size) throws BrokerException;
 }
Index: modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/client/validator/test/SelectRepositoryOrJournalWidget.java
===================================================================
--- modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/client/validator/test/SelectRepositoryOrJournalWidget.java	(revision 51029)
+++ modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/client/validator/test/SelectRepositoryOrJournalWidget.java	(revision 51030)
@@ -26,9 +26,9 @@
 
     private Form baseURLForm = new Form();
 
-    private RadioButton chooseExistingBaseURLRadio = new RadioButton("baseURLRadio", "Choose existing base URL", false);
+    private RadioButton chooseExistingBaseURLRadio = new RadioButton("baseURLRadio", "Select base URL from one of your registered repositories", false);
     private ListBox existingBaseURLsListBox = new ListBox();
-    private RadioButton addManuallyRadio = new RadioButton("baseURLRadio", "or enter one manually", false);
+    private RadioButton addManuallyRadio = new RadioButton("baseURLRadio", "or enter new", false);
     private TextBox baseURLTextBox = new TextBox();
 
     public SelectRepositoryOrJournalWidget(List<String> repositoryURLs) {
Index: modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/client/validator/test/SelectRepositoryTypeWidget.java
===================================================================
--- modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/client/validator/test/SelectRepositoryTypeWidget.java	(revision 51029)
+++ modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/client/validator/test/SelectRepositoryTypeWidget.java	(revision 51030)
@@ -69,7 +69,7 @@
 
         String content = "";
 
-        content += "<div class=\"uk-margin uk-grid\" uk-grid=\"\">\n" +
+        content += "<div class=\"uk-margin uk-grid repositoryTypeSelection\" uk-grid=\"\">\n" +
                 "\t<div class=\"uk-width-expand@m uk-width-1-3@s uk-grid-item-match uk-first-column\">\n" +
                 "    \t<div class=\"uk-text-center uk-card uk-card-default uk-card-hover uk-scrollspy-inview uk-animation-slide-top-medium\" uk-scrollspy-class=\"\" data-id=\"page#38\" style=\"\">\n" +
                 "        \t<a href=\"#validate/literature\" class=\"el-link uk-position-cover uk-margin-remove-adjacent\"></a>\n" +
@@ -77,8 +77,8 @@
                 "                <img src=\"img/Literature_repos_wide.png\" class=\"el-image\" alt=\"\" style=\"width: 100%\">\n" +
                 "            </div>        \n" +
                 "            <div class=\"uk-card-body\">\n" +
-                "                <h3 class=\"el-title uk-margin uk-card-title uk-margin-remove-adjacent uk-margin-small-bottom\">Validate Literature Repository</h3>\n" +
-                "\t\t\t\t<div class=\"el-meta uk-margin uk-text-meta\">Lorem ipsum dolor sit amet, consectetur adipiscing elit...</div>\n" +
+                "                <h3 class=\"el-title uk-margin uk-card-title uk-margin-remove-adjacent uk-margin-small-bottom\">Run compatibility test against the OpenAIRE literature guidelines.</h3>\n" +
+//                "\t\t\t\t<div class=\"el-meta uk-margin uk-text-meta\">Lorem ipsum dolor sit amet, consectetur adipiscing elit...</div>\n" +
                 "            </div>\n" +
                 "\t\t</div>\n" +
                 "\t</div>\n" +
@@ -90,8 +90,8 @@
                 "                <img src=\"img/Data_repos_wide.png\" class=\"el-image\" alt=\"\" style=\"width: 100%\">\n" +
                 "            </div>        \n" +
                 "            <div class=\"uk-card-body\">\n" +
-                "                <h3 class=\"el-title uk-margin uk-card-title uk-margin-remove-adjacent uk-margin-small-bottom\">Validate Data Repository</h3>\n" +
-                "\t\t\t\t<div class=\"el-meta uk-margin uk-text-meta\">Lorem ipsum dolor sit amet, consectetur adipiscing elit...</div>\n" +
+                "                <h3 class=\"el-title uk-margin uk-card-title uk-margin-remove-adjacent uk-margin-small-bottom\">Run compatibility test against the OpenAIRE Guidelines for Data Archives.</h3>\n" +
+//                "\t\t\t\t<div class=\"el-meta uk-margin uk-text-meta\">Lorem ipsum dolor sit amet, consectetur adipiscing elit...</div>\n" +
                 "            </div>\n" +
                 "\t\t</div>\n" +
                 "\t</div>\n" +
@@ -102,8 +102,8 @@
                 "            \t<img src=\"img/CRIS_wide.png\" class=\"el-image\" alt=\"\" style=\"width: 100%\">\n" +
                 "            </div>        \n" +
                 "            <div class=\"uk-card-body\">\n" +
-                "                <h3 class=\"el-title uk-margin uk-card-title uk-margin-remove-adjacent uk-margin-small-bottom\">Validate Cris Repository</h3>\n" +
-                "\t\t\t\t<div class=\"el-meta uk-margin uk-text-meta\">Lorem ipsum dolor sit amet, consectetur adipiscing elit...</div>\n" +
+                "                <h3 class=\"el-title uk-margin uk-card-title uk-margin-remove-adjacent uk-margin-small-bottom\">Run compatibility test against the OpenAIRE Guidelines for CRIS Managers based on CERIF-XML.</h3>\n" +
+//                "\t\t\t\t<div class=\"el-meta uk-margin uk-text-meta\">Lorem ipsum dolor sit amet, consectetur adipiscing elit...</div>\n" +
                 "            </div>\n" +
                 "\t\t</div>\n" +
                 "\t</div>\n" +
Index: modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/client/validator/test/SelectParametersWidget.java
===================================================================
--- modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/client/validator/test/SelectParametersWidget.java	(revision 51029)
+++ modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/client/validator/test/SelectParametersWidget.java	(revision 51030)
@@ -57,7 +57,7 @@
         selectParametersWidgetPanel.addStyleName("uk-margin-top");
 
         // RECORDS
-        recordsLabel.setHTML("<label>Number of records</label>");
+        recordsLabel.setHTML("<label>Number of records to validate</label>");
 
         recordsPanel.addStyleName("marginBottom20");
         recordsPanel.add(recordsLabel);
@@ -110,7 +110,7 @@
         setsForm.add(setsListBox);
 
         // XPATH
-        xPathLabel.setHTML("<label>Would you like to group your results by a specific record's field?</label>");
+        xPathLabel.setHTML("<label>Would you like to group your results by a specific field?</label>");
 
         xPathPanel.addStyleName("xPathPanel marginBottom20");
         xPathPanel.add(xPathLabel);
Index: modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/client/validator/test/ValidationWizardCompleteWidget.java
===================================================================
--- modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/client/validator/test/ValidationWizardCompleteWidget.java	(revision 51029)
+++ modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/client/validator/test/ValidationWizardCompleteWidget.java	(revision 51030)
@@ -25,8 +25,7 @@
 //        contentPanel.addStyleName("success");
 
         HTML html = new HTML();
-        html.setHTML("<div class=\"success\"><i class=\"fa fa-check-circle\"></i><h3>Validation has begun " +
-                "successfully!</h3></div>");
+        html.setHTML("<div class=\"success\"><i class=\"fa fa-check-circle\"></i><h3>Validation has begun</h3></div>");
 
         contentPanel.add(html);
 
Index: modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/client/validator/test/SelectGuidelinesWidget.java
===================================================================
--- modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/client/validator/test/SelectGuidelinesWidget.java	(revision 51029)
+++ modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/client/validator/test/SelectGuidelinesWidget.java	(revision 51030)
@@ -87,7 +87,7 @@
             counter++;
         }
 
-        showAdvanced.setText("Show Advanced");
+        showAdvanced.setText("Show Content and Usage Rules");
         showAdvanced.setIcon(IconType.ANGLE_DOWN);
         showAdvanced.setIconPosition(IconPosition.LEFT);
         showAdvanced.addStyleName("showAdvanced");
@@ -97,12 +97,12 @@
             public void onClick(ClickEvent event) {
                 if(areRulesShown) {
                     areRulesShown = false;
-                    showAdvanced.setText("Show Advanced");
+                    showAdvanced.setText("Show Content and Usage Rules");
                     showAdvanced.setIcon(IconType.ANGLE_DOWN);
                     selectGuidelinesWidgetPanel.remove(selectRulesPanel);
                 } else {
                     areRulesShown = true;
-                    showAdvanced.setText("Hide Advanced");
+                    showAdvanced.setText("Hide Content and Usage Rules");
                     showAdvanced.setIcon(IconType.ANGLE_UP);
                     selectGuidelinesWidgetPanel.add(selectRulesPanel);
                 }
Index: modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/client/monitor/AggregationHistoryTimeline.java
===================================================================
--- modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/client/monitor/AggregationHistoryTimeline.java	(nonexistent)
+++ modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/client/monitor/AggregationHistoryTimeline.java	(revision 51030)
@@ -0,0 +1,156 @@
+package eu.dnetlib.repo.manager.client.monitor;
+
+import com.google.gwt.i18n.client.DateTimeFormat;
+import com.google.gwt.user.client.ui.FlowPanel;
+import com.google.gwt.user.client.ui.HTML;
+import com.google.gwt.user.client.ui.IsWidget;
+import com.google.gwt.user.client.ui.Widget;
+import eu.dnetlib.repo.manager.shared.AggregationDetails;
+
+import java.util.List;
+
+/**
+ * Created by stefania on 1/16/18.
+ */
+public class AggregationHistoryTimeline implements IsWidget {
+
+    private FlowPanel aggregationHistoryPanel = new FlowPanel();
+
+    private DateTimeFormat dtf = DateTimeFormat.getFormat("yyyy-MM-dd");
+
+    public AggregationHistoryTimeline(List<AggregationDetails> aggregationHistory) {
+
+        aggregationHistoryPanel.addStyleName("uk-width-1-1@m");
+
+        FlowPanel section = new FlowPanel();
+        section.addStyleName("section md-bg-blue-grey-700");
+        aggregationHistoryPanel.add(section);
+
+        FlowPanel container = new FlowPanel();
+        container.addStyleName("uk-container uk-container-center");
+        section.add(container);
+
+        FlowPanel timeline = new FlowPanel();
+        timeline.addStyleName("al_timeline");
+        container.add(timeline);
+
+        for(AggregationDetails aggregationDetails: aggregationHistory) {
+
+            FlowPanel timelineBlock = new FlowPanel();
+            timelineBlock.addStyleName("al_timeline_block versionChange");
+
+            FlowPanel timelineImage = new FlowPanel();
+            timelineImage.addStyleName("al_timeline_image uk-scrollspy-init-inview uk-scrollspy-inview uk-animation-scale-up");
+            timelineBlock.add(timelineImage);
+
+            FlowPanel timelineContent = new FlowPanel();
+            timelineContent.addStyleName("al_timeline_content uk-scrollspy-init-inview uk-scrollspy-inview uk-animation-slide-left");
+            timelineBlock.add(timelineContent);
+
+            String content = "";
+
+            if(aggregationDetails.getDate()!=null)
+                content += "<h3>" + dtf.format(aggregationDetails.getDate()) + "</h3>";
+
+            if(aggregationDetails.getAggregationStage()!=null)
+                content += "<p>Aggregation stage - " + aggregationDetails.getAggregationStage() + "</p>";
+
+            if(aggregationDetails.getCollectionMode()!=null)
+                content += "<p>Collection mode - " + aggregationDetails.getCollectionMode() + "</p>";
+
+            content += "<p>Number of records - " + aggregationDetails.getNumberOfRecords() + "</p>";
+//                    "<a class=\"md-btn md-btn-primary\" href=\"#\">View version details</a>" ;
+            timelineContent.add(new HTML(content));
+
+            timeline.add(timelineBlock);
+        }
+
+//        String timelineContent = "<div _ngcontent-c5=\"\" class=\"uk-width-1-1@m\">\n" +
+//                "<section _ngcontent-c5=\"\" class=\"section md-bg-blue-grey-700\">\n" +
+//                "                                        <div _ngcontent-c5=\"\" class=\"uk-container uk-container-center\">\n" +
+//                "                                            <div _ngcontent-c5=\"\" class=\"al_timeline\">\n" +
+//                "                                                <div _ngcontent-c5=\"\" class=\"al_timeline_block versionChange\">\n" +
+//                "                                                    <div _ngcontent-c5=\"\" class=\"al_timeline_image uk-scrollspy-init-inview uk-scrollspy-inview uk-animation-scale-up\">\n" +
+//                "                                                    </div>\n" +
+//                "                                                    <div _ngcontent-c5=\"\" class=\"al_timeline_content uk-scrollspy-init-inview uk-scrollspy-inview uk-animation-slide-left\">\n" +
+//                "                                                        <h3 _ngcontent-c5=\"\">Version 3</h3>\n" +
+//                "                                                        <p _ngcontent-c5=\"\">Updated to this version on 08/08/17 by Antonis Lempesis</p>\n" +
+//                "                                                        <a _ngcontent-c5=\"\" class=\"md-btn md-btn-primary\" href=\"#\">View version details</a>\n" +
+//                "                                                    </div>\n" +
+//                "                                                </div>\n" +
+//                "                                                <div _ngcontent-c5=\"\" class=\"al_timeline_block update\">\n" +
+//                "                                                    <div _ngcontent-c5=\"\" class=\"al_timeline_image uk-scrollspy-init-inview uk-scrollspy-inview uk-animation-scale-up\">\n" +
+//                "                                                    </div>\n" +
+//                "                                                    <div _ngcontent-c5=\"\" class=\"al_timeline_content uk-scrollspy-init-inview uk-scrollspy-inview uk-animation-slide-right\">\n" +
+//                "                                                        <h3 _ngcontent-c5=\"\">Updated</h3>\n" +
+//                "                                                        <p _ngcontent-c5=\"\">on 07/06/17 by George Papastefanatos</p>\n" +
+//                "                                                    </div>\n" +
+//                "                                                </div>\n" +
+//                "                                                <div _ngcontent-c5=\"\" class=\"al_timeline_block update\">\n" +
+//                "                                                    <div _ngcontent-c5=\"\" class=\"al_timeline_image uk-scrollspy-init-inview uk-scrollspy-inview uk-animation-scale-up\">\n" +
+//                "                                                    </div>\n" +
+//                "                                                    <div _ngcontent-c5=\"\" class=\"al_timeline_content uk-scrollspy-init-inview uk-scrollspy-inview uk-animation-slide-right\">\n" +
+//                "                                                        <h3 _ngcontent-c5=\"\">Updated</h3>\n" +
+//                "                                                        <p _ngcontent-c5=\"\">on 05/06/17 by Antonis Lempesis</p>\n" +
+//                "                                                    </div>\n" +
+//                "                                                </div>\n" +
+//                "                                                <div _ngcontent-c5=\"\" class=\"al_timeline_block versionChange\">\n" +
+//                "                                                    <div _ngcontent-c5=\"\" class=\"al_timeline_image uk-scrollspy-init-inview uk-scrollspy-inview uk-animation-scale-up\">\n" +
+//                "                                                    </div>\n" +
+//                "                                                    <div _ngcontent-c5=\"\" class=\"al_timeline_content uk-scrollspy-init-inview uk-scrollspy-inview uk-animation-slide-right\">\n" +
+//                "                                                        <h3 _ngcontent-c5=\"\">Version 2</h3>\n" +
+//                "                                                        <p _ngcontent-c5=\"\">Updated to this version by Stefania Martziou</p>\n" +
+//                "                                                        <a _ngcontent-c5=\"\" class=\"md-btn md-btn-primary\" href=\"#\">View version details</a>\n" +
+//                "                                                    </div>\n" +
+//                "                                                </div>\n" +
+//                "                                                <div _ngcontent-c5=\"\" class=\"al_timeline_block update\">\n" +
+//                "                                                    <div _ngcontent-c5=\"\" class=\"al_timeline_image uk-scrollspy-init-inview uk-scrollspy-inview uk-animation-scale-up\">\n" +
+//                "                                                    </div>\n" +
+//                "                                                    <div _ngcontent-c5=\"\" class=\"al_timeline_content uk-scrollspy-init-inview uk-scrollspy-inview uk-animation-slide-right\">\n" +
+//                "                                                        <h3 _ngcontent-c5=\"\">Updated</h3>\n" +
+//                "                                                        <p _ngcontent-c5=\"\">on 07/06/17 by George Papastefanatos</p>\n" +
+//                "                                                    </div>\n" +
+//                "                                                </div>\n" +
+//                "                                                <div _ngcontent-c5=\"\" class=\"al_timeline_block update\">\n" +
+//                "                                                    <div _ngcontent-c5=\"\" class=\"al_timeline_image uk-scrollspy-init-inview uk-scrollspy-inview uk-animation-scale-up\">\n" +
+//                "                                                    </div>\n" +
+//                "                                                    <div _ngcontent-c5=\"\" class=\"al_timeline_content uk-scrollspy-init-inview uk-scrollspy-inview uk-animation-slide-right\">\n" +
+//                "                                                        <h3 _ngcontent-c5=\"\">Updated</h3>\n" +
+//                "                                                        <p _ngcontent-c5=\"\">on 07/06/17 by Panagiotis Lampropoulos</p>\n" +
+//                "                                                    </div>\n" +
+//                "                                                </div>\n" +
+//                "                                                <div _ngcontent-c5=\"\" class=\"al_timeline_block update\">\n" +
+//                "                                                    <div _ngcontent-c5=\"\" class=\"al_timeline_image uk-scrollspy-init-inview uk-scrollspy-inview uk-animation-scale-up\">\n" +
+//                "                                                    </div>\n" +
+//                "                                                    <div _ngcontent-c5=\"\" class=\"al_timeline_content uk-scrollspy-init-inview uk-scrollspy-inview uk-animation-slide-left\">\n" +
+//                "                                                        <h3 _ngcontent-c5=\"\">Updated</h3>\n" +
+//                "                                                        <p _ngcontent-c5=\"\">on 07/06/17 by Stefania Martziou</p>\n" +
+//                "                                                    </div>\n" +
+//                "                                                </div>\n" +
+//                "                                                <div _ngcontent-c5=\"\" class=\"al_timeline_block versionChange\">\n" +
+//                "                                                    <div _ngcontent-c5=\"\" class=\"al_timeline_image\">\n" +
+//                "                                                    </div>\n" +
+//                "                                                    <div _ngcontent-c5=\"\" class=\"al_timeline_content\">\n" +
+//                "                                                        <h3 _ngcontent-c5=\"\">Version 1</h3>\n" +
+//                "                                                        <p _ngcontent-c5=\"\">Updated to this version on 01/01/2017 by George Papastefanatos</p>\n" +
+//                "                                                        <a _ngcontent-c5=\"\" class=\"md-btn md-btn-primary\" href=\"#\">View version details</a>\n" +
+//                "                                                    </div>\n" +
+//                "                                                </div>\n" +
+//                "                                            </div>\n" +
+//                "                                        </div>\n" +
+//                "                                    </section>\n" +
+//                "\n" +
+//                "\n" +
+//                "                                </div>";
+//
+//        HTML timeline = new HTML(timelineContent);
+//
+//        aggregationHistoryPanel.add(timeline);
+
+    }
+
+    @Override
+    public Widget asWidget() {
+        return aggregationHistoryPanel;
+    }
+}
Index: modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/client/monitor/CollectionMonitorWidget.java
===================================================================
--- modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/client/monitor/CollectionMonitorWidget.java	(nonexistent)
+++ modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/client/monitor/CollectionMonitorWidget.java	(revision 51030)
@@ -0,0 +1,140 @@
+package eu.dnetlib.repo.manager.client.monitor;
+
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.dom.client.Document;
+import com.google.gwt.user.client.Window;
+import com.google.gwt.user.client.rpc.AsyncCallback;
+import com.google.gwt.user.client.ui.FlowPanel;
+import com.google.gwt.user.client.ui.HTML;
+import eu.dnetlib.domain.data.Repository;
+import eu.dnetlib.gwt.client.help.HelpService;
+import eu.dnetlib.gwt.client.help.HelpServiceAsync;
+import eu.dnetlib.repo.manager.client.AbstractRepositoryManagerWidget;
+import eu.dnetlib.repo.manager.client.HelpCallback;
+import eu.dnetlib.repo.manager.client.RepositoryManagerWidget;
+import eu.dnetlib.repo.manager.client.services.RepositoryService;
+import eu.dnetlib.repo.manager.client.services.RepositoryServiceAsync;
+import eu.dnetlib.repo.manager.shared.Aggregations;
+import org.gwtbootstrap3.client.ui.Alert;
+import org.gwtbootstrap3.client.ui.constants.AlertType;
+
+/**
+ * Created by stefania on 1/16/18.
+ */
+public class CollectionMonitorWidget extends AbstractRepositoryManagerWidget implements RepositoryManagerWidget {
+
+    private String parentToken = "";
+    private String restToken = "";
+
+    private Alert errorAlert = new Alert();
+
+    private HTML title = new HTML();
+    private FlowPanel monitorContent = new FlowPanel();
+
+    private static HelpServiceAsync helpService = GWT.create(HelpService.class);
+    private RepositoryServiceAsync repositoryService = GWT.create(RepositoryService.class);
+
+    public CollectionMonitorWidget() {
+
+        super();
+
+        title.addStyleName("uk-margin-medium-bottom");
+        contentPanel.add(title);
+
+        errorAlert.setType(AlertType.DANGER);
+        errorAlert.setDismissable(false);
+        errorAlert.setVisible(false);
+        contentPanel.add(errorAlert);
+
+        contentPanel.add(monitorContent);
+    }
+
+    @Override
+    public void clear() {
+
+        monitorContent.clear();
+        errorAlert.setVisible(false);
+        gridPanel.remove(helpPanel);
+    }
+
+    @Override
+    public void reload() {
+
+        errorAlert.setVisible(false);
+
+        Document.get().getElementById("headerNoTransparent").removeClassName("tm-header-transparent");
+
+        helpService.getHelpById(parentToken, new HelpCallback(helpPanel, gridPanel));
+
+        final HTML loadingWheel = new HTML("<div class=\"loader-big\" style=\"text-align: center; padding-top: 170px; " +
+                "color: rgb(47, 64, 80); font-weight: bold;\">Retrieving repository info...</div>" +
+                "<div class=\"whiteFilm\"></div>");
+        monitorContent.addStyleName("loading-big");
+        monitorContent.add(loadingWheel);
+
+        repositoryService.getRepository(restToken, new AsyncCallback<Repository>() {
+
+            @Override
+            public void onFailure(Throwable throwable) {
+
+                monitorContent.removeStyleName("loading-big");
+                monitorContent.remove(loadingWheel);
+
+                Alert errorAlert = new Alert();
+                errorAlert.setType(AlertType.DANGER);
+                errorAlert.setText("System error retrieving repository info.");
+                errorAlert.setDismissable(false);
+                monitorContent.add(errorAlert);
+            }
+
+            @Override
+            public void onSuccess(Repository repository) {
+
+                title.setHTML("<h1 class=\"uk-article-title\">Aggregation history for " + repository.getOfficialName() + "</h1>");
+
+                repositoryService.getRepositoryAggregations(restToken, new AsyncCallback<Aggregations>() {
+
+                    @Override
+                    public void onFailure(Throwable throwable) {
+
+                        monitorContent.removeStyleName("loading-big");
+                        monitorContent.remove(loadingWheel);
+
+                        Alert errorAlert = new Alert();
+                        errorAlert.setType(AlertType.DANGER);
+                        errorAlert.setText("System error retrieving repository aggregation history.");
+                        errorAlert.setDismissable(false);
+                        monitorContent.add(errorAlert);
+                    }
+
+                    @Override
+                    public void onSuccess(Aggregations aggregations) {
+
+                        monitorContent.removeStyleName("loading-big");
+                        monitorContent.remove(loadingWheel);
+
+                        if(aggregations==null || aggregations.getAggregationHistory()==null
+                                || aggregations.getAggregationHistory().isEmpty()) {
+                            HTML message = new HTML("<div>There is no aggregation history for this repository at the moment</div>");
+                            monitorContent.add(message);
+                        } else {
+                            AggregationHistoryTimeline aggregationHistoryTimeline = new AggregationHistoryTimeline(aggregations.getAggregationHistory());
+                            monitorContent.add(aggregationHistoryTimeline.asWidget());
+                        }
+                    }
+                });
+            }
+        });
+    }
+
+    @Override
+    public void setToken(String parentToken, String rest) {
+        this.parentToken = parentToken;
+        this.restToken = rest;
+    }
+
+    @Override
+    public void afterAdditionToRootPanel() {
+
+    }
+}
Index: modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/client/monitor/MonitorController.java
===================================================================
--- modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/client/monitor/MonitorController.java	(revision 51029)
+++ modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/client/monitor/MonitorController.java	(revision 51030)
@@ -9,6 +9,7 @@
 public class MonitorController extends TokenController {
 
     private MonitorWidget monitorWidget = new MonitorWidget();
+    private CollectionMonitorWidget collectionMonitorWidget = new CollectionMonitorWidget();
 
     private static MonitorController instance = null;
 
@@ -25,7 +26,7 @@
         if (rest == null)
             redrawWidget(contentPanel, monitorWidget, parent, rest);
         else {
-//            redrawWidget(contentPanel, viewJobDetailsWidget, parent, rest);
+            redrawWidget(contentPanel, collectionMonitorWidget, parent, rest);
         }
     }
 
Index: modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/client/monitor/MonitorWidget.java
===================================================================
--- modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/client/monitor/MonitorWidget.java	(revision 51029)
+++ modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/client/monitor/MonitorWidget.java	(revision 51030)
@@ -2,6 +2,7 @@
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.dom.client.Document;
+import com.google.gwt.user.client.rpc.AsyncCallback;
 import com.google.gwt.user.client.ui.FlowPanel;
 import com.google.gwt.user.client.ui.HTML;
 import eu.dnetlib.gwt.client.help.HelpService;
@@ -8,9 +9,13 @@
 import eu.dnetlib.gwt.client.help.HelpServiceAsync;
 import eu.dnetlib.repo.manager.client.AbstractRepositoryManagerWidget;
 import eu.dnetlib.repo.manager.client.HelpCallback;
+import eu.dnetlib.repo.manager.client.RepositoryManager;
 import eu.dnetlib.repo.manager.client.RepositoryManagerWidget;
 import eu.dnetlib.repo.manager.client.services.RepositoryService;
 import eu.dnetlib.repo.manager.client.services.RepositoryServiceAsync;
+import eu.dnetlib.repo.manager.client.widgets.ListOrGridViewOfDatasourcesWidget;
+import eu.dnetlib.repo.manager.client.widgets.OpenAIRECompliantLogoDownloadWidget;
+import eu.dnetlib.repo.manager.shared.DatasourcesCollection;
 import org.gwtbootstrap3.client.ui.Alert;
 import org.gwtbootstrap3.client.ui.constants.AlertType;
 
@@ -61,14 +66,41 @@
 
         helpService.getHelpById(parentToken, new HelpCallback(helpPanel, gridPanel));
 
-        HTML comingSoon = new HTML("Coming soon...");
-        monitorContent.add(comingSoon);
+        final HTML loadingWheel = new HTML("<div class=\"loader-big\" style=\"text-align: center; padding-top: 170px; " +
+                "color: rgb(47, 64, 80); font-weight: bold;\">Retrieving repositories...</div>" +
+                "<div class=\"whiteFilm\"></div>");
+        monitorContent.addStyleName("loading-big");
+        monitorContent.add(loadingWheel);
 
-//        final HTML loadingWheel = new HTML("<div class=\"loader-big\" style=\"text-align: center; padding-top: 170px; " +
-//                "color: rgb(47, 64, 80); font-weight: bold;\">Retrieving repositories...</div>" +
-//                "<div class=\"whiteFilm\"></div>");
-//        getImpactContent.addStyleName("loading-big");
-//        getImpactContent.add(loadingWheel);
+        repositoryService.getRepositoriesOfUser(RepositoryManager.currentUser.getEmail(), true, false,
+                new AsyncCallback<DatasourcesCollection>() {
+
+                    @Override
+                    public void onFailure(Throwable caught) {
+
+                        monitorContent.removeStyleName("loading-big");
+                        monitorContent.remove(loadingWheel);
+
+                        Alert errorAlert = new Alert();
+                        errorAlert.setType(AlertType.DANGER);
+                        errorAlert.setText("System error retrieving repositories.");
+                        errorAlert.setDismissable(false);
+                        monitorContent.add(errorAlert);
+                    }
+
+                    @Override
+                    public void onSuccess(DatasourcesCollection datasourcesCollection) {
+
+                        monitorContent.removeStyleName("loading-big");
+                        monitorContent.remove(loadingWheel);
+
+                        ListOrGridViewOfDatasourcesWidget listOrGridViewOfDatasourcesWidget =
+                                new ListOrGridViewOfDatasourcesWidget(datasourcesCollection, "Choose the Datasource you would like to manage",
+                                        parentToken, "<i class=\"fa fa-pencil\" aria-hidden=\"true\"></i>", false);
+
+                        monitorContent.add(listOrGridViewOfDatasourcesWidget.asWidget());
+                    }
+                });
     }
 
     @Override
Index: modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/client/admin/metrics/MetricsAdminWidget.java
===================================================================
--- modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/client/admin/metrics/MetricsAdminWidget.java	(revision 51029)
+++ modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/client/admin/metrics/MetricsAdminWidget.java	(revision 51030)
@@ -7,6 +7,7 @@
 import com.google.gwt.i18n.client.DateTimeFormat;
 import com.google.gwt.query.client.Function;
 import com.google.gwt.user.client.Event;
+import com.google.gwt.user.client.Window;
 import com.google.gwt.user.client.rpc.AsyncCallback;
 import com.google.gwt.user.client.ui.FlowPanel;
 import com.google.gwt.user.client.ui.HTML;
@@ -313,6 +314,8 @@
 
                         clear();
                         reload();
+
+                        Window.scrollTo(0, 0);
                     }
                 });
             }
Index: modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/client/enrichcontent/SelectTopicWidget.java
===================================================================
--- modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/client/enrichcontent/SelectTopicWidget.java	(revision 51029)
+++ modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/client/enrichcontent/SelectTopicWidget.java	(revision 51030)
@@ -10,15 +10,20 @@
 import eu.dnetlib.gwt.client.help.HelpServiceAsync;
 import eu.dnetlib.repo.manager.client.AbstractRepositoryManagerWidget;
 import eu.dnetlib.repo.manager.client.HelpCallback;
+import eu.dnetlib.repo.manager.client.RepositoryManager;
 import eu.dnetlib.repo.manager.client.RepositoryManagerWidget;
 import eu.dnetlib.repo.manager.client.services.BrokerService;
 import eu.dnetlib.repo.manager.client.services.BrokerServiceAsync;
+import eu.dnetlib.repo.manager.shared.Term;
 import eu.dnetlib.repo.manager.shared.Tuple;
 import eu.dnetlib.repo.manager.shared.broker.BrowseEntry;
 import org.gwtbootstrap3.client.ui.Alert;
 import org.gwtbootstrap3.client.ui.constants.AlertType;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by stefania on 10/31/16.
@@ -28,10 +33,13 @@
     private String parentToken = "";
     private String restToken = "";
 
+    private HTML title = new HTML();
     private FlowPanel selectTopicBoxContent = new FlowPanel();
 
     private Alert errorAlert = new Alert();
 
+    public static Map<String, Term> topicsVocabulary = new HashMap<>();
+
     private static HelpServiceAsync helpService = GWT.create(HelpService.class);
     private static BrokerServiceAsync brokerService = GWT.create(BrokerService.class);
 
@@ -39,8 +47,6 @@
 
         super();
 
-        //TODO find datasource name?
-        HTML title = new HTML("<h1 class=\"uk-article-title\">Topics for datasource</h1>");
         title.addStyleName("uk-margin-medium-bottom");
         contentPanel.add(title);
 
@@ -66,6 +72,8 @@
         Document.get().getElementById("headerNoTransparent").removeClassName("tm-header-transparent");
         selectTopicBoxContent.add(errorAlert);
 
+        title.setHTML("<h1 class=\"uk-article-title\">Enrichments for " + restToken + "</h1>");
+
         helpService.getHelpById(parentToken + "_selectTopic", new HelpCallback(helpPanel, gridPanel));
 
         final HTML loadingWheel = new HTML("<div class=\"loader-big\" style=\"text-align: center; padding-top: 170px; " +
@@ -87,14 +95,34 @@
             }
 
             @Override
-            public void onSuccess(List<BrowseEntry> browseEntries) {
+            public void onSuccess(final List<BrowseEntry> browseEntries) {
 
-                selectTopicBoxContent.removeStyleName("loading-big");
-                selectTopicBoxContent.remove(loadingWheel);
+                brokerService.getDnetTopics(new AsyncCallback<Map<String, Term>>() {
 
-                final FlowPanel topicsList = new FlowPanel();
-                createTopicsList(browseEntries, topicsList);
-                selectTopicBoxContent.add(topicsList);
+                    @Override
+                    public void onFailure(Throwable throwable) {
+
+                        selectTopicBoxContent.removeStyleName("loading-big");
+                        selectTopicBoxContent.remove(loadingWheel);
+
+                        errorAlert.setText("System error retrieving topics vocabulary.");
+                        errorAlert.setVisible(true);
+                    }
+
+                    @Override
+                    public void onSuccess(Map<String, Term> stringTermMap) {
+
+                        topicsVocabulary.putAll(stringTermMap);
+
+                        selectTopicBoxContent.removeStyleName("loading-big");
+                        selectTopicBoxContent.remove(loadingWheel);
+
+                        final FlowPanel topicsList = new FlowPanel();
+                        createTopicsList(browseEntries, topicsList);
+                        selectTopicBoxContent.add(topicsList);
+                    }
+                });
+
             }
         });
     }
@@ -120,52 +148,87 @@
 
         } else {
 
-            long total = 0;
+            List<BrowseEntry> enrichMoreEntries = new ArrayList<>();
+            List<BrowseEntry> enrichMissingEntries = new ArrayList<>();
 
-            FlowPanel colPanel = new FlowPanel();
-            colPanel.addStyleName("uk-width-1-1@m uk-first-column");
-            topicsList.add(colPanel);
+            for(BrowseEntry browseEntry : browseEntries) {
+                if(browseEntry.getValue().startsWith("ENRICH/MORE"))
+                    enrichMoreEntries.add(browseEntry);
+                else if(browseEntry.getValue().startsWith("ENRICH/MISSING"))
+                    enrichMissingEntries.add(browseEntry);
+            }
 
-            FlowPanel divPanel = new FlowPanel();
-            divPanel.addStyleName("uk-overflow-auto uk-scrollspy-inview uk-animation-slide-top-medium");
-            colPanel.add(divPanel);
+            //COLUMN FOR ENRICH/MORE
+            FlowPanel colPanel1 = new FlowPanel();
+            colPanel1.addStyleName("uk-width-1-2@m uk-first-column");
+            topicsList.add(colPanel1);
 
-            String content = "<table class=\"uk-table uk-table-striped uk-table-middle\">" +
-                    "<thead><tr><th>Topic</th><th class=\"uk-text-nowrap\"># of events</th>" +
-                    "</tr></thead>";
+            colPanel1.add(createTopicGroupPanel(enrichMoreEntries, "More"));
 
-            content += "<tbody>";
+            //COLUMN FOR ENRICH/MISSING
+            FlowPanel colPanel2 = new FlowPanel();
+            colPanel2.addStyleName("uk-width-1-2@m uk-first-column");
+            topicsList.add(colPanel2);
 
-            for(BrowseEntry browseEntry : browseEntries) {
+            colPanel2.add(createTopicGroupPanel(enrichMissingEntries, "Missing"));
 
-                content += "<tr class=\"el-item\">" +
-                        "<td class=\"uk-text-nowrap uk-table-shrink\">\n" +
-                        "<a href=\"#" + parentToken + "/" + restToken + "/" +browseEntry.getValue() + "\" class=\"el-link\">" +
-                        browseEntry.getValue() + "</a>" +
-                        "</td>" +
-                        "<td class=\"uk-text-nowrap uk-table-shrink\">\n" +
-                        "<div class=\"el-title\">" + browseEntry.getSize() + "</div>" +
-                        "</td>" +
-                        "</tr>";
 
-                total += browseEntry.getSize();
-            }
+        }
+    }
 
-            content += "<tr class=\"el-item footers\">" +
-                    "<td class=\"uk-text-nowrap uk-table-shrink\">\n" +
-                    "<div class=\"el-title\">Total</div>" +
+    private FlowPanel createTopicGroupPanel(List<BrowseEntry> browseEntries, String group) {
+
+        long total = 0;
+
+        FlowPanel divPanel = new FlowPanel();
+        divPanel.addStyleName("uk-overflow-auto uk-scrollspy-inview uk-animation-slide-top-medium");
+
+        String content = "<h4 class=\"uk-h4 uk-text-primary uk-scrollspy-inview uk-animation-slide-top-medium\" " +
+                "uk-scrollspy-class=\"\"><span>" + group + "</span></h4>";
+
+        content += "<table class=\"uk-table uk-table-striped uk-table-middle\">" +
+//                "<thead><tr><th>Related events that may potentially enrich " + restToken + " content</th>" +
+                "<thead><tr><th>Events that may enrich " + restToken + " content</th>" +
+                "<th class=\"uk-text-nowrap\"># of events</th>" +
+                "</tr></thead>";
+
+        content += "<tbody>";
+
+        for(BrowseEntry browseEntry : browseEntries) {
+
+            content += "<tr class=\"el-item\">" +
+                    "<td class=\"uk-table-shrink uk-width-4-5\">\n" +
+                    "<a href=\"#" + parentToken + "/" + restToken + "/" + browseEntry.getValue() + "\" class=\"el-link\">" +
+                    browseEntry.getValue() + "</a>";
+
+            if(this.topicsVocabulary.get(browseEntry.getValue())!=null)
+                content +=   "<div class=\"uk-text uk-text-meta\">" + this.topicsVocabulary.get(browseEntry.getValue()).getEnglishName() + "</div>";
+
+            content += "</td>" +
+                    "<td class=\"uk-text-nowrap uk-table-shrink uk-width-1-5\">\n" +
+                    "<div class=\"el-title\">" + browseEntry.getSize() + "</div>" +
                     "</td>" +
-                    "<td class=\"uk-text-nowrap uk-table-shrink\">\n" +
-                    "<div class=\"el-title\">" + total + "</div>" +
-                    "</td>" +
                     "</tr>";
 
-            content += "</tbody></table>";
+            total += browseEntry.getSize();
+        }
 
-            HTML reposListHTML = new HTML();
-            reposListHTML.setHTML(content);
+        content += "<tr class=\"el-item footers\">" +
+                "<td class=\"uk-text-nowrap uk-table-shrink uk-width-4-5\">\n" +
+                "<div class=\"el-title\">Total</div>" +
+                "</td>" +
+                "<td class=\"uk-text-nowrap uk-table-shrink uk-width-1-5\">\n" +
+                "<div class=\"el-title\">" + total + "</div>" +
+                "</td>" +
+                "</tr>";
 
-            divPanel.add(reposListHTML);
-        }
+        content += "</tbody></table>";
+
+        HTML reposListHTML = new HTML();
+        reposListHTML.setHTML(content);
+
+        divPanel.add(reposListHTML);
+
+        return divPanel;
     }
 }
Index: modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/client/enrichcontent/ShowEventsWidget.java
===================================================================
--- modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/client/enrichcontent/ShowEventsWidget.java	(revision 51029)
+++ modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/client/enrichcontent/ShowEventsWidget.java	(revision 51030)
@@ -52,6 +52,7 @@
 //    private FlowPanel showEventsListColPanel = new FlowPanel();
 //    private FlowPanel showEventsInnerPanel = new FlowPanel();
 //    private FlowPanel showEventsBox = new FlowPanel();
+    private HTML title = new HTML();
     private FlowPanel showEventsBoxContent = new FlowPanel();
 
 //    private FlowPanel showAdvancedSearchColPanel = new FlowPanel();
@@ -69,7 +70,6 @@
 
         super();
 
-        HTML title = new HTML("<h1 class=\"uk-article-title\">Events for topic " + topic + "</h1>");
         title.addStyleName("uk-margin-medium-bottom");
         contentPanel.add(title);
 
@@ -137,6 +137,9 @@
 
         Document.get().getElementById("headerNoTransparent").removeClassName("tm-header-transparent");
 
+        title.setHTML("<h1 class=\"uk-article-title\">" + dataSource + "</h1><div class=\"uk-text uk-text-small uk-text-secondary\">" +
+                topic.replace("/", "  |  ") + "</div>");
+
         advQueryObject.setDatasource(dataSource);
         advQueryObject.setTopic(topic);
 
@@ -218,8 +221,8 @@
 
         final FlowPanel advancedSearch = new FlowPanel();
         advancedSearch.addStyleName("enrichContentAdvancedSearch uk-card uk-card-body uk-card-default sidemenu");
-        advancedSearch.add(new HTML("<h4 class=\"uk-h4 uk-text-primary uk-scrollspy-inview uk-animation-slide-top-medium\"" +
-                "uk-scrollspy-class=\"\"><span>Advanced search</span></h4>"));
+        advancedSearch.add(new HTML("<h6 class=\"uk-h6 uk-text-primary uk-scrollspy-inview uk-animation-slide-top-medium\"" +
+                "uk-scrollspy-class=\"\"><span>Tweak and refine events</span></h4>"));
         advancedSearch.add(enrichContentAdvancedSearchForm.asWidget());
 
         return advancedSearch;
@@ -300,8 +303,8 @@
                 to = eventsPage.getTotal();
 
             HTML numberOfResultsLabel = new HTML("<span>Showing " + from + "-" + to + " of " + eventsPage.getTotal() + " results</span>" +
-                    "<span class=\"uk-float-right\"><button id=\"subscribe\" style=\"\" type=\"button\" class=\"uk-button btn-success\">" +
-                    "Subscribe to these events</button></span>");
+                    "<span class=\"uk-float-right\"><button id=\"subscribe\" style=\"\" type=\"button\" class=\"uk-button " +
+                    "uk-button-primary uk-button-small\">Subscribe to these events</button></span>");
             numberOfResultsLabel.addStyleName("numberOfEventsLabel");
             eventsList.add(numberOfResultsLabel);
 
@@ -399,7 +402,7 @@
 
         // ID
         payloadContent += "<tr class=\"el-item\">" +
-                "<td class=\"uk-table-shrink\">" +
+                "<td class=\"uk-table-shrink uk-width-1-4\">" +
                 "<strong class=\"el-title uk-display-block\">ID</strong>" +
                 "</td>" +
                 "<td class=\"uk-table-shrink\">\n" +
@@ -409,7 +412,7 @@
 
 
         // TITLES
-        payloadContent += "<tr class=\"el-item\"><td class=\"uk-table-shrink\"><strong class=\"el-title uk-display-block\">" +
+        payloadContent += "<tr class=\"el-item\"><td class=\"uk-table-shrink uk-width-1-4\"><strong class=\"el-title uk-display-block\">" +
                 "Title(s)</strong></td><td class=\"uk-table-shrink\"><div class=\"el-title\">";
 
         for(int i=0; i<openAireEventPayload.getPublication().getTitles().size(); i++) {
@@ -421,12 +424,12 @@
 
 
         // AUTHORS
-        payloadContent += "<tr class=\"el-item\"><td class=\"uk-table-shrink\"><strong class=\"el-title uk-display-block\">" +
+        payloadContent += "<tr class=\"el-item\"><td class=\"uk-table-shrink uk-width-1-4\"><strong class=\"el-title uk-display-block\">" +
                 "Author(s)</strong></td><td class=\"uk-table-shrink\"><div class=\"el-title\">";
 
         for(int i=0; i<openAireEventPayload.getPublication().getCreators().size(); i++) {
             if(i!=0)
-                payloadContent += "<br>";
+                payloadContent += " | ";
             payloadContent += "<span>" + openAireEventPayload.getPublication().getCreators().get(i) + "</span>";
         }
         payloadContent += "</div></td></tr>";
@@ -439,7 +442,7 @@
             payloadContent += "<tr class=\"el-item\">";
         }
 
-        payloadContent += "<td class=\"uk-table-shrink\"><strong class=\"el-title uk-display-block\">" +
+        payloadContent += "<td class=\"uk-table-shrink uk-width-1-4\"><strong class=\"el-title uk-display-block\">" +
                 "PID(s)</strong></td><td class=\"uk-table-shrink\"><div class=\"el-title\">";
 
         for(Pid pid : openAireEventPayload.getPublication().getPids()) {
@@ -478,7 +481,7 @@
             payloadContent += "<tr class=\"el-item\">";
         }
 
-        payloadContent += "<td class=\"uk-table-shrink\"><strong class=\"el-title uk-display-block\">" +
+        payloadContent += "<td class=\"uk-table-shrink uk-width-1-4\"><strong class=\"el-title uk-display-block\">" +
                 "Abstract(s)</strong></td><td class=\"uk-table-shrink\"><div class=\"el-title\">";
 
         for(int i=0; i<openAireEventPayload.getPublication().getAbstracts().size(); i++) {
@@ -512,7 +515,7 @@
             payloadContent += "<tr class=\"el-item\">";
         }
 
-        payloadContent += "<td class=\"uk-table-shrink\"><strong class=\"el-title uk-display-block\">" +
+        payloadContent += "<td class=\"uk-table-shrink uk-width-1-4\"><strong class=\"el-title uk-display-block\">" +
                 "Project(s)/Relation(s)</strong></td><td class=\"uk-table-shrink\"><div class=\"el-title\">";
 
         for(int i=0; i<openAireEventPayload.getPublication().getProjects().size(); i++) {
@@ -544,36 +547,50 @@
 
         // SUBJECTS
         if(openAireEventPayload.getHighlight().getSubjects()!=null && !openAireEventPayload.getHighlight().getSubjects().isEmpty()) {
+
             payloadContent += "<tr class=\"el-item success\">";
-        } else {
-            payloadContent += "<tr class=\"el-item\">";
-        }
 
-        payloadContent += "<td class=\"uk-table-shrink\"><strong class=\"el-title uk-display-block\">" +
-                "Subject(s)</strong></td><td class=\"uk-table-shrink\"><div class=\"el-title\">";
+            payloadContent += "<td class=\"uk-table-shrink uk-width-1-4\"><strong class=\"el-title uk-display-block\">" +
+                    "Subject(s)</strong></td><td class=\"uk-table-shrink\"><div class=\"el-title\">";
 
-        for(int i=0; i<openAireEventPayload.getPublication().getSubjects().size(); i++) {
-            if(i!=0)
-                payloadContent += "<br>";
-            payloadContent += "<span>" + openAireEventPayload.getPublication().getSubjects().get(i) + "</span>";
+            for(int i=0; i<openAireEventPayload.getPublication().getSubjects().size(); i++) {
+                if(i!=0)
+                    payloadContent += "<br>";
+                payloadContent += "<span>" + openAireEventPayload.getPublication().getSubjects().get(i) + "</span>";
 
-            if(openAireEventPayload.getHighlight().getSubjects()!=null && !openAireEventPayload.getHighlight().getSubjects().isEmpty()
-                    && openAireEventPayload.getProvenance()!=null) {
+                if(openAireEventPayload.getHighlight().getSubjects()!=null && !openAireEventPayload.getHighlight().getSubjects().isEmpty()
+                        && openAireEventPayload.getProvenance()!=null) {
 
-                payloadContent += "<span class=\"pull-right\">" +
-                        "<b>from: </b>";
-                if (openAireEventPayload.getProvenance().getUrl() != null) {
-                    payloadContent += "<a href=\"" + openAireEventPayload.getProvenance().getUrl() + "\" target=\"_blank\">" +
-                            openAireEventPayload.getProvenance().getRepositoryName() + "</a>";
+                    payloadContent += "<span class=\"pull-right\">" +
+                            "<b>from: </b>";
+                    if (openAireEventPayload.getProvenance().getUrl() != null) {
+                        payloadContent += "<a href=\"" + openAireEventPayload.getProvenance().getUrl() + "\" target=\"_blank\">" +
+                                openAireEventPayload.getProvenance().getRepositoryName() + "</a>";
+                    }
+                    if (openAireEventPayload.getProvenance().getId() != null) {
+                        payloadContent += "<span> (ID: " + openAireEventPayload.getProvenance().getId() + ")</span>";
+                    }
+
+                    payloadContent += "</span>";
                 }
-                if (openAireEventPayload.getProvenance().getId() != null) {
-                    payloadContent += "<span> (ID: " + openAireEventPayload.getProvenance().getId() + ")</span>";
-                }
+            }
+            payloadContent += "</div></td></tr>";
 
-                payloadContent += "</span>";
+        } else {
+
+            payloadContent += "<tr class=\"el-item\">";
+
+            payloadContent += "<td class=\"uk-table-shrink uk-width-1-4\"><strong class=\"el-title uk-display-block\">" +
+                    "Subject(s)</strong></td><td class=\"uk-table-shrink\"><div class=\"el-title\">";
+
+            for(int i=0; i<openAireEventPayload.getPublication().getSubjects().size(); i++) {
+                if(i!=0)
+                    payloadContent += ", ";
+                payloadContent += "<span>" + openAireEventPayload.getPublication().getSubjects().get(i) + "</span>";
+
             }
+            payloadContent += "</div></td></tr>";
         }
-        payloadContent += "</div></td></tr>";
 
 
         // PUBLICATION DATE
@@ -584,7 +601,7 @@
             payloadContent += "<tr class=\"el-item\">";
         }
 
-        payloadContent += "<td class=\"uk-table-shrink\"><strong class=\"el-title uk-display-block\">" +
+        payloadContent += "<td class=\"uk-table-shrink uk-width-1-4\"><strong class=\"el-title uk-display-block\">" +
                 "Publication date</strong></td><td class=\"uk-table-shrink\"><div class=\"el-title\">" +
                 openAireEventPayload.getPublication().getPublicationdate() +
                 "</div></td></tr>";
@@ -598,7 +615,7 @@
             payloadContent += "<tr class=\"el-item\">";
         }
 
-        payloadContent += "<td class=\"uk-table-shrink\"><strong class=\"el-title uk-display-block\">" +
+        payloadContent += "<td class=\"uk-table-shrink uk-width-1-4\"><strong class=\"el-title uk-display-block\">" +
                 "Rights</strong></td><td class=\"uk-table-shrink\"><div class=\"el-title\">";
 
         for(int i=0; i<openAireEventPayload.getPublication().getInstances().size(); i++) {
@@ -682,7 +699,7 @@
 
                 FlowPanel modalContent = new FlowPanel();
 
-                HTML title = new HTML("<h2 class=\"uk-modal-title\">Create subscription</h2>\n");
+                HTML title = new HTML("<h2 class=\"uk-modal-title\">Create subscription for</h2>\n");
                 modalContent.add(title);
 
                 final EventsSubscriptionForm eventsSubscriptionForm = new EventsSubscriptionForm(advQueryObject);
@@ -727,7 +744,7 @@
                                 public void onSuccess(Subscription result) {
 
                                     successAlert.setVisible(true);
-                                    successAlert.setText("A subscription for these events was created successfully");
+                                    successAlert.setText("Your subscription was successful");
 
                                     subscribeToEvents.hide();
                                     subscribeToEvents.removeFromParent();
Index: modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/client/enrichcontent/BrowseSubscriptionsWidget.java
===================================================================
--- modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/client/enrichcontent/BrowseSubscriptionsWidget.java	(revision 51029)
+++ modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/client/enrichcontent/BrowseSubscriptionsWidget.java	(revision 51030)
@@ -6,6 +6,7 @@
 import com.google.gwt.event.dom.client.ClickHandler;
 import com.google.gwt.query.client.Function;
 import com.google.gwt.user.client.Event;
+import com.google.gwt.user.client.Window;
 import com.google.gwt.user.client.rpc.AsyncCallback;
 import com.google.gwt.user.client.ui.FlowPanel;
 import com.google.gwt.user.client.ui.HTML;
@@ -84,7 +85,7 @@
         browseSubscriptionsBoxContent.addStyleName("loading-big");
         browseSubscriptionsBoxContent.add(loadingWheel);
 
-        brokerService.getSubscriptionsOfUser(RepositoryManager.currentUser.getEmail(),
+        brokerService.getSimpleSubscriptionsOfUser(RepositoryManager.currentUser.getEmail(),
                 new AsyncCallback<Map<String, List<SimpleSubscriptionDesc>>>() {
             @Override
             public void onFailure(Throwable caught) {
@@ -252,6 +253,8 @@
 
                         clear();
                         reload();
+
+                        Window.scrollTo(0, 0);
                     }
                 });
             }
Index: modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/client/enrichcontent/EventsSubscriptionForm.java
===================================================================
--- modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/client/enrichcontent/EventsSubscriptionForm.java	(revision 51029)
+++ modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/client/enrichcontent/EventsSubscriptionForm.java	(revision 51030)
@@ -41,6 +41,9 @@
         errorLabel.setDismissable(false);
         subscriptionFormPanel.add(errorLabel);
 
+        subscriptionFormPanel.add(new HTML("<h4 class=\"uk-h4\">" + this.advQueryObject.getDatasource() + "</h4>" +
+                "<div class=\"uk-text uk-text-small uk-text-secondary\">" + this.advQueryObject.getTopic().replace("/", "  |  ") + "</div>"));
+
         subscriptionFormPanel.add(subscriptionForm);
 
         HTML userEmail = new HTML(RepositoryManager.currentUser.getEmail());
@@ -52,10 +55,10 @@
             frequencyListBox.addItem(notificationFrequency.name(), notificationFrequency.name());
         subscriptionForm.add(frequencyListFormGroup);
 
-        modeListBox.addItem("-- none selected --", "noneSelected");
-        for(NotificationMode notificationMode : NotificationMode.values())
-            modeListBox.addItem(notificationMode.name(), notificationMode.name());
-        subscriptionForm.add(modeListFormGroup);
+//        modeListBox.addItem("-- none selected --", "noneSelected");
+//        for(NotificationMode notificationMode : NotificationMode.values())
+//            modeListBox.addItem(notificationMode.name(), notificationMode.name());
+//        subscriptionForm.add(modeListFormGroup);
 
         HTML options = new HTML();
         options.setHTML(generateOptionsContent());
@@ -72,8 +75,8 @@
 
         errorLabel.setVisible(false);
 
-        if(!frequencyListBox.getSelectedValue().equals("noneSelected") &&
-                !modeListBox.getSelectedValue().equals("noneSelected"))
+        if(!frequencyListBox.getSelectedValue().equals("noneSelected"))
+//                && !modeListBox.getSelectedValue().equals("noneSelected"))
             return true;
         else {
             errorLabel.setVisible(true);
@@ -98,15 +101,15 @@
 
         String optionsContent = "<table class=\"table table-bordered\">";
 
-        optionsContent += "<thead><tr><th>Name</th><th>Values</th></tr></thead>";
+//        optionsContent += "<thead><tr><th>Name</th><th>Values</th></tr></thead>";
         optionsContent += "<tbody>";
 
-        if(advQueryObject.getDatasource()!=null && !advQueryObject.getDatasource().equals(""))
-            optionsContent += "<tr><td>Datasource</td><td>" + advQueryObject.getDatasource() + "</td></tr>";
+//        if(advQueryObject.getDatasource()!=null && !advQueryObject.getDatasource().equals(""))
+//            optionsContent += "<tr><td>Datasource</td><td>" + advQueryObject.getDatasource() + "</td></tr>";
+//
+//        if(advQueryObject.getTopic()!=null && !advQueryObject.getTopic().equals(""))
+//            optionsContent += "<tr><td>Topic</td><td>" + advQueryObject.getTopic() + "</td></tr>";
 
-        if(advQueryObject.getTopic()!=null && !advQueryObject.getTopic().equals(""))
-            optionsContent += "<tr><td>Topic</td><td>" + advQueryObject.getTopic() + "</td></tr>";
-
         if(advQueryObject.getTrust()!=null)
             optionsContent += "<tr><td>Trust</td><td>[" + advQueryObject.getTrust().getMin() + ", " + advQueryObject.getTrust().getMax() + "]</td></tr>";
 
Index: modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/client/TokenController.java
===================================================================
--- modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/client/TokenController.java	(revision 51029)
+++ modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/client/TokenController.java	(revision 51030)
@@ -1,5 +1,6 @@
 package eu.dnetlib.repo.manager.client;
 
+import com.google.gwt.user.client.Window;
 import com.google.gwt.user.client.ui.FlowPanel;
 
 import java.util.HashMap;
@@ -57,6 +58,8 @@
 
         contentPanel.add(widget.asWidget());
 
+        Window.scrollTo(0, 0);
+
         widget.afterAdditionToRootPanel();
     }
 }
Index: modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/client/datasources/utils/SelectRepositoryWidget.java
===================================================================
--- modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/client/datasources/utils/SelectRepositoryWidget.java	(revision 51029)
+++ modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/client/datasources/utils/SelectRepositoryWidget.java	(revision 51030)
@@ -176,7 +176,7 @@
             }
         });
 
-        form.add(new MyFormGroup(false, "Select repository's country", countriesListBox));
+        form.add(new MyFormGroup(false, "Country", countriesListBox));
 
         autocomplete.setValueChangeHandler(new ValueChangeHandler() {
             @Override
@@ -205,7 +205,7 @@
             }
         });
         autocomplete.setEnabled(false);
-        form.add(new MyFormGroup(false, "Start typing in the name of your repository to narrow down the view", autocomplete));
+        form.add(new MyFormGroup(false, "Search by repository name", autocomplete));
 
         selectRepositoryPanel.add(form);
 
Index: modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/client/datasources/register/SelectRepositoryTypeWidget.java
===================================================================
--- modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/client/datasources/register/SelectRepositoryTypeWidget.java	(revision 51029)
+++ modules/uoa-repository-manager-gui/branches/aai/src/main/java/eu/dnetlib/repo/manager/client/datasources/register/SelectRepositoryTypeWidget.java	(revision 51030)
@@ -69,7 +69,7 @@
 
         String content = "";
 
-        content += "<div class=\"uk-margin uk-grid\" uk-grid=\"\">\n" +
+        content += "<div class=\"uk-margin uk-grid repositoryTypeSelection\" uk-grid=\"\">\n" +
                 "\t<div class=\"uk-width-expand@m uk-width-1-2@s uk-grid-item-match uk-first-column\">\n" +
                 "    \t<div class=\"uk-text-center uk-card uk-card-default uk-card-hover uk-scrollspy-inview uk-animation-slide-top-medium\" uk-scrollspy-class=\"\" data-id=\"page#38\" style=\"\">\n" +
                 "        \t<a href=\"#registerDatasource/literature\" class=\"el-link uk-position-cover uk-margin-remove-adjacent\"></a>\n" +
@@ -77,7 +77,7 @@
                 "                <img src=\"img/Literature_repos_square.png\" class=\"el-image\" alt=\"\" style=\"width: 100%\">\n" +
                 "            </div>        \n" +
                 "            <div class=\"uk-card-body\">\n" +
-                "                <h3 class=\"el-title uk-margin uk-card-title uk-margin-remove-adjacent uk-margin-small-bottom\">Literature Repository</h3>\n" +
+                "                <h3 class=\"el-title uk-margin uk-card-title uk-margin-remove-adjacent uk-margin-small-bottom\">Make sure your repository is already registered in OpenDOAR, the authoritative directory of institutional and thematic OA repositories.</h3>\n" +
                 "\t\t\t\t<div class=\"el-meta uk-margin uk-text-meta\"><a href=\"http://www.opendoar.org\" target=\"_blank\">List provided by <br>OpenDOAR<i class=\"fa fa-external-link\" style=\"margin-left:3px\"></i></a></div>\n" +
                 "            </div>\n" +
                 "\t\t</div>\n" +
@@ -90,7 +90,7 @@
                 "                <img src=\"img/Data_repos_sqare.png\" class=\"el-image\" alt=\"\" style=\"width: 100%\">\n" +
                 "            </div>        \n" +
                 "            <div class=\"uk-card-body\">\n" +
-                "                <h3 class=\"el-title uk-margin uk-card-title uk-margin-remove-adjacent uk-margin-small-bottom\">Data Repository</h3>\n" +
+                "                <h3 class=\"el-title uk-margin uk-card-title uk-margin-remove-adjacent uk-margin-small-bottom\">Make sure your data repository is registered in Re3Data, the global registry of research data repositories from different academic disciplines. </h3>\n" +
                 "\t\t\t\t<div class=\"el-meta uk-margin uk-text-meta\"><a href=\"http://www.re3data.org\" target=\"_blank\">List provided by <br>Re3data<i class=\"fa fa-external-link\" style=\"margin-left:3px\"></i></a></div>\n" +
                 "            </div>\n" +
                 "\t\t</div>\n" +
@@ -102,8 +102,8 @@
                 "            \t<img src=\"img/OAJournals_square.png\" class=\"el-image\" alt=\"\" style=\"width: 100%\">\n" +
                 "            </div>        \n" +
                 "            <div class=\"uk-card-body\">\n" +
-                "                <h3 class=\"el-title uk-margin uk-card-title uk-margin-remove-adjacent uk-margin-small-bottom\">Journal</h3>\n" +
-                "\t\t\t\t<div class=\"el-meta uk-margin uk-text-meta\">Lorem ipsum dolor sit amet, consectetur adipiscing elit...</div>\n" +
+                "                <h3 class=\"el-title uk-margin uk-card-title uk-margin-remove-adjacent uk-margin-small-bottom\">Make sure that your Open Access Journal is compatible with the OpenAIRE literature Guidelines.</h3>\n" +
+                "\t\t\t\t<div class=\"el-meta uk-margin uk-text-meta\"><a href=\"https://www.openaire.eu/helpdesk/\" target=\"_blank\">For any questions please contact the OpenAIRE helpdesk.<i class=\"fa fa-external-link\" style=\"margin-left:3px\"></i></a></div>\n" +
                 "            </div>\n" +
                 "\t\t</div>\n" +
                 "\t</div>\n" +
@@ -114,8 +114,8 @@
                 "            \t<img src=\"img/Icons_Aggregators_square.png\" class=\"el-image\" alt=\"\" style=\"width: 100%\">\n" +
                 "            </div>        \n" +
                 "            <div class=\"uk-card-body\">\n" +
-                "                <h3 class=\"el-title uk-margin uk-card-title uk-margin-remove-adjacent uk-margin-small-bottom\">Aggregator</h3>\n" +
-                "\t\t\t\t<div class=\"el-meta uk-margin uk-text-meta\">Lorem ipsum dolor sit amet, consectetur adipiscing elit...</div>\n" +
+                "                <h3 class=\"el-title uk-margin uk-card-title uk-margin-remove-adjacent uk-margin-small-bottom\">Make sure that your publications aggregator is compatible with the OpenAIRE literature Guidelines.</h3>\n" +
+                "\t\t\t\t<div class=\"el-meta uk-margin uk-text-meta\"><a href=\"https://www.openaire.eu/helpdesk/\" target=\"_blank\">For any questions please contact the OpenAIRE helpdesk.<i class=\"fa fa-external-link\" style=\"margin-left:3px\"></i></a></div>\n" +
                 "            </div>\n" +
                 "\t\t</div>\n" +
                 "\t</div>\n" +
Index: modules/uoa-repository-manager-gui/branches/aai/src/main/webapp/RepositoryManager.css
===================================================================
--- modules/uoa-repository-manager-gui/branches/aai/src/main/webapp/RepositoryManager.css	(revision 51029)
+++ modules/uoa-repository-manager-gui/branches/aai/src/main/webapp/RepositoryManager.css	(revision 51030)
@@ -914,11 +914,21 @@
   vertical-align: top !important;
 }
 
-.jobs-list.uk-table td {
-  padding: 3px 6px 0px 6px;
+/*.jobs-list.uk-table td {*/
+  /*padding: 3px 6px 0px 6px;*/
+/*}*/
+
+a.resubmitJob i {
+  margin-left: 5px;
 }
 
+.jobs-list.uk-table tr:nth-child(2n+1) td {
+  padding: 15px 6px 0px 6px;
+}
 
+.jobs-list.uk-table tr:nth-child(2n) td {
+  padding: 0px 6px 15px 6px;
+}
 
 /**********************************************/
 
@@ -1006,6 +1016,11 @@
   font-size: 12px;
 }
 
+.advancedSearchForm input[type="text"]:not([class*="uk-"]) {
+  height: 25px;
+  line-height: 23px;
+}
+
 .advancedSearchForm .form-control {
   width: 90% !important;
   margin-bottom: 5px !important;
@@ -1436,3 +1451,271 @@
   /*background: #d13f96;*/
   /*font-weight: 600;*/
 /*}*/
+
+
+
+.repositoryTypeSelection .uk-card-body {
+  padding: 20px 20px;
+}
+
+.repositoryTypeSelection .el-title {
+  font-size: 16px;
+}
+
+/********************************/
+
+.section {
+  padding: 48px 0;
+  position: relative;
+}
+
+/*.md-bg-blue-grey-700 {*/
+  /*background-color: #214c9c !important;*/
+/*}*/
+
+.al_timeline {
+  position: relative;
+  padding: 24px 20px 32px;
+  font-size: 80%;
+}
+
+.al_timeline::after {
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  margin-left: -2px;
+  left: 50%;
+  content: '';
+  width: 4px;
+  /*background: rgba(255, 255, 255, 0.5);*/
+  /*background: #D1303A;*/
+  background: #040067;
+  display: block;
+}
+
+.al_timeline_block::before, .al_timeline_block::after {
+  content: " ";
+  display: table;
+}
+
+.al_timeline_block::after {
+  clear: both;
+}
+
+.al_timeline_block + * {
+  margin-top: 10px;
+}
+
+.al_timeline_block:nth-child(2n) .al_timeline_content {
+  float: right;
+}
+
+.al_timeline_block:nth-child(2n+1) .al_timeline_content {
+  text-align: right;
+}
+
+[class*="uk-animation-"] {
+  -webkit-animation-duration: .5s;
+  animation-duration: .5s;
+  -webkit-animation-timing-function: ease-out;
+  animation-timing-function: ease-out;
+  -webkit-animation-fill-mode: both;
+  animation-fill-mode: both;
+}
+
+.uk-animation-scale-up {
+  -webkit-animation-name: uk-fade-scale-02;
+  animation-name: uk-fade-scale-02;
+}
+
+[class*="uk-animation-"] {
+  -webkit-animation-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
+  animation-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
+  -webkit-animation-duration: 560ms;
+  animation-duration: 560ms;
+}
+
+.al_timeline_image {
+  position: absolute;
+  left: 50%;
+  width: 64px;
+  height: 64px;
+  margin-left: -32px;
+  background: #fff;
+  border-radius: 50%;
+  text-align: center;
+  z-index: 10;
+  box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23);
+}
+
+[class*="uk-animation-"] {
+  -webkit-animation-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
+  animation-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
+  -webkit-animation-duration: 840ms;
+  animation-duration: 840ms;
+}
+
+[data-uk-scrollspy*="uk-animation-"]:not([data-uk-scrollspy*="target"]) {
+  opacity: 0;
+}
+
+[class*="uk-animation-"] {
+  -webkit-animation-duration: .5s;
+  animation-duration: .5s;
+  -webkit-animation-timing-function: ease-out;
+  animation-timing-function: ease-out;
+  -webkit-animation-fill-mode: both;
+  animation-fill-mode: both;
+}
+
+.uk-animation-slide-left {
+  -webkit-animation-name: uk-fade-left;
+  animation-name: uk-fade-left;
+}
+
+[class*="uk-animation-"] {
+  -webkit-animation-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
+  animation-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
+  -webkit-animation-duration: 560ms;
+  animation-duration: 560ms;
+}
+
+.al_timeline_content {
+  box-sizing: border-box;
+  background: #fff;
+  width: 44%;
+  padding: 8px 15px;
+  box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23);
+  position: relative;
+  border-radius: 4px;
+}
+
+[class*="uk-animation-"] {
+  -webkit-animation-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
+  animation-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
+  -webkit-animation-duration: 840ms;
+  animation-duration: 840ms;
+}
+
+[data-uk-scrollspy*="uk-animation-"]:not([data-uk-scrollspy*="target"]) {
+  opacity: 0;
+}
+
+.md-color-red-600 {
+  /*color: #e53935 !important;*/
+  color: #040067 !important;
+}
+
+.material-icons {
+  font-family: 'Material Icons';
+  font-weight: normal;
+  font-style: normal;
+  font-size: 18px;
+  display: inline-block;
+  width: 1em;
+  height: 1em;
+  line-height: 1;
+  text-transform: none;
+  letter-spacing: normal;
+  -webkit-font-smoothing: antialiased;
+  text-rendering: optimizeLegibility;
+  -moz-osx-font-smoothing: grayscale;
+  -webkit-font-feature-settings: 'liga';
+  font-feature-settings: 'liga';
+  vertical-align: -4px;
+  color: rgba(0, 0, 0, 0.54);
+}
+
+.al_timeline_image {
+  position: absolute;
+  left: 50%;
+  width: 40px;
+  height: 40px;
+  margin-left: -20px;
+  background: #fff;
+  border-radius: 50%;
+  text-align: center;
+  z-index: 10;
+  box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23);
+  margin-top: 12px;
+}
+
+.al_timeline_block.update .al_timeline_image {
+  position: absolute;
+  left: 50%;
+  width: 24px;
+  height: 24px;
+  margin-left: -12px;
+  /*background: #D1303A;*/
+  background: #040067;
+  border-radius: 50%;
+  text-align: center;
+  z-index: 10;
+  box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23);
+  margin-top: 20px;
+}
+
+.al_timeline_image > i {
+  font-size: 32px;
+  line-height: 64px;
+}
+
+.al_timeline_content::after {
+  position: absolute;
+  top: 24px;
+  right: -20px;
+  content: '';
+  display: block;
+  border: 10px solid transparent;
+  border-left-color: transparent;
+  border-left-color: #fff;
+}
+
+.al_timeline_block.update .al_timeline_content::after {
+  position: absolute;
+  top: 24px;
+  right: -20px;
+  content: '';
+  display: block;
+  border: 10px solid transparent;
+  border-left-color: transparent;
+  border-left-color: #214c9c;
+}
+
+.al_timeline_block:nth-child(2n) .al_timeline_content::after {
+  border-left-color: transparent;
+  border-right-color: #fff;
+  right: auto;
+  left: -20px;
+}
+
+.update.al_timeline_block:nth-child(2n) .al_timeline_content::after {
+  border-left-color: transparent;
+  border-right-color: #214c9c;
+  right: auto;
+  left: -20px;
+}
+
+.al_timeline_content h3 {
+  margin: 0 0 5px 0;
+}
+
+.al_timeline_content p {
+  margin: 0 0 5px 0;
+}
+
+* + p, * + ul, * + ol, * + dl, * + pre, * + address, * + fieldset, * + figure {
+  margin-top: 5px;
+}
+
+.al_timeline_block.update .al_timeline_content {
+  background: #214c9c;
+  box-shadow: none;
+  color: #fff;
+}
+
+.al_timeline_block.update .al_timeline_content h3 {
+  color: #fff;
+}
+
+/********************************/
