diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary
index 2eb0671..ca430fd 160000
--- a/src/app/openaireLibrary
+++ b/src/app/openaireLibrary
@@ -1 +1 @@
-Subproject commit 2eb06717dd681898ef47da0f5da39a9005df3878
+Subproject commit ca430fd89f7654bb71f52383bd52bf58e4c70e5f
diff --git a/src/app/topic/indicators.component.html b/src/app/topic/indicators.component.html
index 7f0e7ab..ccafef8 100644
--- a/src/app/topic/indicators.component.html
+++ b/src/app/topic/indicators.component.html
@@ -2,10 +2,8 @@
   <div *ngIf="numberSections">
     <h6 class="uk-text-bold">Number Indicators</h6>
     <ng-template ngFor [ngForOf]="numbers" let-number let-i="index">
-      <div [id]="'number-' + number._id"
-           class="uk-grid-match  uk-grid-small uk-grid uk-margin-top section"
-           uk-sortable="group: number" uk-grid>
-        <div class="tools disable-sortable uk-sortable-nodrag">
+      <div class="section uk-margin-top uk-padding-small">
+        <div class="tools">
           <div class="actions">
             <a [class.uk-disabled]="editing" class="" (click)="createSection(i, 'number')"
                title="Create a new section">
@@ -28,8 +26,7 @@
             <!--              </ng-container>-->
           </div>
         </div>
-        <div *ngIf="numberSections.at(i)"
-             class="uk-width-1-1 uk-margin-medium-bottom disable-sortable uk-sortable-nodrag">
+        <div *ngIf="numberSections.at(i)" class="uk-margin-medium-bottom">
           <div dashboard-input [formInput]="numberSections.at(i).get('title')"
                [extraLeft]="false" class="uk-width-1-3@m uk-width-1-1" placeholder="Title"
                inputClass="input-borderless uk-h5 uk-margin-remove">
@@ -41,68 +38,70 @@
             </div>
           </div>
         </div>
-        <ng-template ngFor [ngForOf]="number.indicators" let-indicator let-j="index">
-          <div *ngIf="indicator" [id]="indicator._id"
-               [ngClass]="getNumberClassBySize(indicator.width)">
-            <div class="uk-card uk-card-default uk-flex uk-flex-column uk-flex-center uk-position-relative uk-card-hover">
-              <div class="uk-card-body">
-                <ng-container
-                    *ngTemplateOutlet="visibilityOptions; context:{indicator: indicator, sectionId: number._id}"></ng-container>
-                <div
-                    [attr.uk-tooltip]="exportLoading ? 'title:Edit is disabled, while exporting indicators; cls:uk-active' : 'cls: uk-invisible'"
-                    class="uk-position-top-right uk-margin-small-right uk-margin-small-top clickable">
-                  <i [class]="exportLoading ? 'uk-disabled ' : ' '" uk-icon="more-vertical"
-                     (click)="$event.stopPropagation();$event.preventDefault()"></i>
-                  <div #element uk-dropdown="mode: click; pos: bottom-right; delay-hide: 0; flip: false">
-                    <ul class="uk-nav uk-dropdown-nav">
-                      <li *ngIf="!editing"><a
-                          (click)="editNumberIndicatorOpen(number, indicator._id)">Edit</a></li>
-                      <ng-template ngFor [ngForOf]="stakeholderUtils.visibility" let-v>
-                        <li *ngIf="indicator.visibility != v.value"><a (click)="changeIndicatorStatus(number._id,
+        <div [id]="'number-' + number._id" class="uk-grid-match uk-grid-small uk-grid" uk-sortable="group: chart" uk-grid>
+          <ng-template ngFor [ngForOf]="number.indicators" let-indicator let-j="index">
+            <div *ngIf="indicator" [id]="indicator._id"
+                 [ngClass]="getNumberClassBySize(indicator.width)">
+              <div class="uk-card uk-card-default uk-flex uk-flex-column uk-flex-center uk-position-relative uk-card-hover">
+                <div class="uk-card-body">
+                  <ng-container
+                      *ngTemplateOutlet="visibilityOptions; context:{indicator: indicator, sectionId: number._id}"></ng-container>
+                  <div
+                      [attr.uk-tooltip]="exportLoading ? 'title:Edit is disabled, while exporting indicators; cls:uk-active' : 'cls: uk-invisible'"
+                      class="uk-position-top-right uk-margin-small-right uk-margin-small-top clickable">
+                    <i [class]="exportLoading ? 'uk-disabled ' : ' '" uk-icon="more-vertical"
+                       (click)="$event.stopPropagation();$event.preventDefault()"></i>
+                    <div #element uk-dropdown="mode: click; pos: bottom-right; delay-hide: 0; flip: false">
+                      <ul class="uk-nav uk-dropdown-nav">
+                        <li *ngIf="!editing"><a
+                            (click)="editNumberIndicatorOpen(number, indicator._id)">Edit</a></li>
+                        <ng-template ngFor [ngForOf]="stakeholderUtils.visibility" let-v>
+                          <li *ngIf="indicator.visibility != v.value"><a (click)="changeIndicatorStatus(number._id,
                            indicator, v.value); hide(element)">
-                          {{'Make ' + v.label.toLowerCase()}}</a>
+                            {{'Make ' + v.label.toLowerCase()}}</a>
+                          </li>
+                        </ng-template>
+                        <hr *ngIf="!indicator.defaultId" class="uk-nav-divider">
+                        <li *ngIf="!indicator.defaultId && !editing"><a
+                            (click)="deleteIndicatorOpen(number, indicator._id, 'number', 'delete');hide(element)">Delete</a>
+                          <!--                            <ng-container *ngIf="!stakeholder.defaultId">-->
+                          <!--                              <a (click)="deleteIndicatorOpen(number, indicator._id, 'number', 'delete');hide(element)">Delete from all profiles</a>-->
+                          <!--                              <a (click)="deleteIndicatorOpen(number, indicator._id, 'number', 'disconnect');hide(element)">Delete and disconnect from all profiles</a>-->
+                          <!--                            </ng-container>-->
                         </li>
-                      </ng-template>
-                      <hr *ngIf="!indicator.defaultId" class="uk-nav-divider">
-                      <li *ngIf="!indicator.defaultId && !editing"><a
-                          (click)="deleteIndicatorOpen(number, indicator._id, 'number', 'delete');hide(element)">Delete</a>
-                        <!--                            <ng-container *ngIf="!stakeholder.defaultId">-->
-                        <!--                              <a (click)="deleteIndicatorOpen(number, indicator._id, 'number', 'delete');hide(element)">Delete from all profiles</a>-->
-                        <!--                              <a (click)="deleteIndicatorOpen(number, indicator._id, 'number', 'disconnect');hide(element)">Delete and disconnect from all profiles</a>-->
-                        <!--                            </ng-container>-->
-                      </li>
-                    </ul>
+                      </ul>
+                    </div>
                   </div>
-                </div>
-                <div>
-                  <div class="uk-text-center uk-text-bold">
-                    {{indicator.name ? indicator.name : 'No title available'}}
+                  <div>
+                    <div class="uk-text-center uk-text-bold">
+                      {{indicator.name ? indicator.name : 'No title available'}}
+                    </div>
+                    <h3 class="uk-margin-medium-top uk-text-center uk-text-bold">
+                      <span *ngIf="numberResults.get(i + '-' + j)">{{numberResults.get(i + '-' + j) | number}}</span>
+                      <span *ngIf="!numberResults.get(i + '-' + j)">--</span>
+                    </h3>
+                    <!--<ng-container *ngTemplateOutlet="description; context: {indicator:indicator}"></ng-container>-->
                   </div>
-                  <h3 class="uk-margin-medium-top uk-text-center uk-text-bold">
-                    <span *ngIf="numberResults.get(i + '-' + j)">{{numberResults.get(i + '-' + j) | number}}</span>
-                    <span *ngIf="!numberResults.get(i + '-' + j)">--</span>
-                  </h3>
-                  <!--<ng-container *ngTemplateOutlet="description; context: {indicator:indicator}"></ng-container>-->
-                </div>
-                <div *ngIf="indicator.description || indicator.additionalDescription"
-                     class="uk-overlay uk-position-bottom">
-                  <div class="uk-padding multi-line-ellipsis lines-3">
-                    <p class="uk-margin-remove">
+                  <div *ngIf="indicator.description || indicator.additionalDescription"
+                       class="uk-overlay uk-position-bottom">
+                    <div class="uk-padding multi-line-ellipsis lines-3">
+                      <p class="uk-margin-remove">
                   <span *ngIf="indicator.description">
                     {{indicator.description}}
                   </span>
-                      <br>
-                      <span *ngIf="indicator.additionalDescription">
+                        <br>
+                        <span *ngIf="indicator.additionalDescription">
                     {{indicator.additionalDescription}}
                   </span>
-                    </p>
+                      </p>
+                    </div>
                   </div>
                 </div>
               </div>
             </div>
-          </div>
-        </ng-template>
-        <div class="disable-sortable uk-sortable-nodrag uk-width-1-1">
+          </ng-template>
+        </div>
+        <div class="uk-margin-medium-top">
           <div class="uk-grid uk-grid-small" uk-grid>
             <div [ngClass]="getNumberClassBySize('small')">
               <div class="uk-card uk-card-default uk-card-body clickable" (click)="editNumberIndicatorOpen(number)">
@@ -123,10 +122,8 @@
   <div *ngIf="chartSections" class="uk-margin-large-top">
     <h6 class="uk-text-bold">Chart Indicators</h6>
     <ng-template ngFor [ngForOf]="charts" let-chart let-i="index">
-      <div [id]="'chart-' + chart._id"
-           class="uk-grid-match section uk-grid-small uk-grid uk-margin-top"
-           uk-sortable="group: chart" uk-grid>
-        <div class="tools disable-sortable uk-sortable-nodrag">
+      <div class="section uk-margin-top uk-padding-small">
+        <div class="tools">
           <div class="actions">
             <a [class.uk-disabled]="editing" class="" (click)="createSection(i)"
                title="Create a new section">
@@ -150,7 +147,7 @@
           </div>
         </div>
         <div *ngIf="chartSections.at(i)"
-             class="uk-width-1-1 uk-margin-medium-bottom disable-sortable uk-sortable-nodrag">
+             class="uk-margin-medium-bottom">
           <div dashboard-input [formInput]="chartSections.at(i).get('title')"
                [extraLeft]="false" class="uk-width-1-3@m uk-width-1-1" placeholder="Title"
                inputClass="input-borderless uk-h5 uk-margin-remove">
@@ -162,79 +159,81 @@
             </div>
           </div>
         </div>
-        <ng-template ngFor [ngForOf]="chart.indicators" let-indicator let-j="index">
-          <div *ngIf="indicator" [id]="indicator._id"
-               [ngClass]="getChartClassBySize(indicator.width)">
-            <div class="uk-card uk-card-default uk-card-body uk-position-relative uk-card-hover">
-              <ng-container
-                  *ngTemplateOutlet="visibilityOptions; context:{indicator: indicator, sectionId: chart._id}"></ng-container>
-              <div
-                  [attr.uk-tooltip]="exportLoading ? 'title:Edit is disabled, while exporting indicators; cls:uk-active' : 'cls: uk-invisible'"
-                  class="uk-position-top-right uk-margin-small-right uk-margin-small-top clickable">
-                <i [class]="exportLoading ? 'uk-disabled ' : ' '" uk-icon="more-vertical"
-                   (click)="$event.stopPropagation();$event.preventDefault()"></i>
-                <div #element uk-dropdown="mode: click; pos: bottom-right; delay-hide: 0; flip: false">
-                  <ul class="uk-nav uk-dropdown-nav">
-                    <li *ngIf="!editing"><a
-                        (click)="editChartIndicatorOpen(chart, indicator._id);hide(element)">Edit</a>
-                    </li>
-                    <ng-template ngFor [ngForOf]="stakeholderUtils.visibility" let-v>
-                      <li *ngIf="indicator.visibility != v.value"><a (click)="changeIndicatorStatus(chart._id,
-                             indicator, v.value); hide(element)">
-                        {{'Make ' + v.label.toLowerCase()}}</a>
+        <div [id]="'chart-' + chart._id" class="uk-grid-match uk-grid-small uk-grid" uk-sortable="group: chart" uk-grid>
+          <ng-template ngFor [ngForOf]="chart.indicators" let-indicator let-j="index">
+            <div *ngIf="indicator" [id]="indicator._id"
+                 [ngClass]="getChartClassBySize(indicator.width)">
+              <div class="uk-card uk-card-default uk-card-body uk-position-relative uk-card-hover">
+                <ng-container
+                    *ngTemplateOutlet="visibilityOptions; context:{indicator: indicator, sectionId: chart._id}"></ng-container>
+                <div
+                    [attr.uk-tooltip]="exportLoading ? 'title:Edit is disabled, while exporting indicators; cls:uk-active' : 'cls: uk-invisible'"
+                    class="uk-position-top-right uk-margin-small-right uk-margin-small-top clickable">
+                  <i [class]="exportLoading ? 'uk-disabled ' : ' '" uk-icon="more-vertical"
+                     (click)="$event.stopPropagation();$event.preventDefault()"></i>
+                  <div #element uk-dropdown="mode: click; pos: bottom-right; delay-hide: 0; flip: false">
+                    <ul class="uk-nav uk-dropdown-nav">
+                      <li *ngIf="!editing"><a
+                          (click)="editChartIndicatorOpen(chart, indicator._id);hide(element)">Edit</a>
                       </li>
-                    </ng-template>
-                    <hr *ngIf="!indicator.defaultId " class="uk-nav-divider">
-                    <li *ngIf="!editing && !indicator.defaultId "><a
-                        (click)="deleteIndicatorOpen(chart, indicator._id, 'chart', 'delete');hide(element)">
-                      Delete</a>
-                      <!--                            <a (click)="deleteIndicatorOpen(chart, indicator._id, 'chart', 'delete');hide(element)">Delete from all profiles</a>-->
-                      <!--                            <a (click)="deleteIndicatorOpen(chart, indicator._id, 'chart', 'disconnect');hide(element)">Delete and disconnect from all profiles</a>-->
-                    </li>
-                  </ul>
+                      <ng-template ngFor [ngForOf]="stakeholderUtils.visibility" let-v>
+                        <li *ngIf="indicator.visibility != v.value"><a (click)="changeIndicatorStatus(chart._id,
+                             indicator, v.value); hide(element)">
+                          {{'Make ' + v.label.toLowerCase()}}</a>
+                        </li>
+                      </ng-template>
+                      <hr *ngIf="!indicator.defaultId " class="uk-nav-divider">
+                      <li *ngIf="!editing && !indicator.defaultId "><a
+                          (click)="deleteIndicatorOpen(chart, indicator._id, 'chart', 'delete');hide(element)">
+                        Delete</a>
+                        <!--                            <a (click)="deleteIndicatorOpen(chart, indicator._id, 'chart', 'delete');hide(element)">Delete from all profiles</a>-->
+                        <!--                            <a (click)="deleteIndicatorOpen(chart, indicator._id, 'chart', 'disconnect');hide(element)">Delete and disconnect from all profiles</a>-->
+                      </li>
+                    </ul>
+                  </div>
                 </div>
-              </div>
-              <div>
-                <div *ngIf="indicator.name" class="uk-text-center uk-text-bold uk-margin-small-bottom">
-                  {{indicator.name}}
-                </div>
-                <iframe *ngIf="!properties.disableFrameLoad && indicator.indicatorPaths[0] &&
+                <div>
+                  <div *ngIf="indicator.name" class="uk-text-center uk-text-bold uk-margin-small-bottom">
+                    {{indicator.name}}
+                  </div>
+                  <iframe *ngIf="!properties.disableFrameLoad && indicator.indicatorPaths[0] &&
                 indicator.indicatorPaths[0].source !==
                 'image' &&
                                   safeUrls.get(indicatorUtils.getFullUrl(stakeholder, indicator.indicatorPaths[0]))"
-                        [src]="safeUrls.get(indicatorUtils.getFullUrl(stakeholder, indicator.indicatorPaths[0]))"
-                        [class]="' uk-width-1-1 uk-height-' +
+                          [src]="safeUrls.get(indicatorUtils.getFullUrl(stakeholder, indicator.indicatorPaths[0]))"
+                          [class]="' uk-width-1-1 uk-height-' +
                         (indicator.height?indicator.height.toLowerCase():'medium')"></iframe>
-                <div *ngIf="properties.disableFrameLoad &&
+                  <div *ngIf="properties.disableFrameLoad &&
                 indicator.indicatorPaths[0].source !==
                 'image'" class="uk-alert uk-alert-danger uk-text-center">I frames
-                  preview is disabled
-                </div>
-                <div *ngIf="indicator.indicatorPaths[0] && indicator.indicatorPaths[0].source === 'image'">
-                  <img [class]="' uk-width-1-1 uk-height-' +
+                    preview is disabled
+                  </div>
+                  <div *ngIf="indicator.indicatorPaths[0] && indicator.indicatorPaths[0].source === 'image'">
+                    <img [class]="' uk-width-1-1 uk-height-' +
                         (indicator.height?indicator.height.toLowerCase():'medium')"
-                       [src]="indicator.indicatorPaths[0].url">
+                         [src]="indicator.indicatorPaths[0].url">
+                  </div>
+                  <!--<ng-container *ngTemplateOutlet="description; context: {indicator:indicator}"></ng-container>-->
                 </div>
-                <!--<ng-container *ngTemplateOutlet="description; context: {indicator:indicator}"></ng-container>-->
-              </div>
-              <div *ngIf="indicator.description || indicator.additionalDescription"
-                   class="uk-overlay uk-position-bottom">
-                <div class="uk-padding multi-line-ellipsis lines-3">
-                  <p class="uk-margin-remove">
+                <div *ngIf="indicator.description || indicator.additionalDescription"
+                     class="uk-overlay uk-position-bottom">
+                  <div class="uk-padding multi-line-ellipsis lines-3">
+                    <p class="uk-margin-remove">
                     <span *ngIf="indicator.description">
                       {{indicator.description}}
                     </span>
-                    <br>
-                    <span *ngIf="indicator.additionalDescription">
+                      <br>
+                      <span *ngIf="indicator.additionalDescription">
                       {{indicator.additionalDescription}}
                     </span>
-                  </p>
+                    </p>
+                  </div>
                 </div>
               </div>
             </div>
-          </div>
-        </ng-template>
-        <div class="disable-sortable uk-sortable-nodrag uk-width-1-1">
+          </ng-template>
+        </div>
+        <div class="uk-margin-medium-top">
           <div class="uk-grid uk-grid-small" uk-grid>
             <div [ngClass]="getChartClassBySize('small')">
               <div class=" uk-card uk-card-default uk-card-body clickable" (click)="editChartIndicatorOpen(chart)">
diff --git a/src/assets/common-assets b/src/assets/common-assets
index 28db142..18d805e 160000
--- a/src/assets/common-assets
+++ b/src/assets/common-assets
@@ -1 +1 @@
-Subproject commit 28db142aa54b8bea87ada52dbae2da7c7da8f458
+Subproject commit 18d805e05fe839e143f9f1eeb9fd42f4dcea67d0
diff --git a/src/assets/dashboard-theme b/src/assets/dashboard-theme
index 8f65666..3534471 160000
--- a/src/assets/dashboard-theme
+++ b/src/assets/dashboard-theme
@@ -1 +1 @@
-Subproject commit 8f656664973f82d9f6f0228968a77643964da805
+Subproject commit 3534471c8c7dcd58d53cb8ad84a92e051ef72dd8