diff --git a/projects/common-map/src/fm-map/components/legend/histogram-details/histogram-details.component.html b/projects/common-map/src/fm-map/components/legend/histogram-details/histogram-details.component.html
index e9e618c..f90fd6f 100644
--- a/projects/common-map/src/fm-map/components/legend/histogram-details/histogram-details.component.html
+++ b/projects/common-map/src/fm-map/components/legend/histogram-details/histogram-details.component.html
@@ -1,15 +1,15 @@
 <div class="row pl-3">
-  <div class="col-8 nopadding" i18n>Average<span>:</span></div>
+  <div class="col-8 nopadding"><span i18n>Average</span>:</div>
   <div class="col-4 pull-left nopadding">{{histogram.mean| number:'1.0-2'}}</div>
-  <div class="col-8 nopadding" i18n>Standard deviation<span>:</span></div>
+  <div class="col-8 nopadding"><span i18n>Standard deviation</span>:</div>
   <div class="col-4 pull-left nopadding">{{histogram.stddev| number:'1.0-2'}}</div>
-  <div class="col-8 nopadding" i18n>Min<span>:</span></div>
+  <div class="col-8 nopadding"><span i18n>Min</span>:</div>
   <div class="col-4 pull-left nopadding">{{histogram.min| number:'1.0-2'}}</div>
-  <div class="col-8 nopadding" i18n>Max<span>:</span></div>
+  <div class="col-8 nopadding" ><span i18n>Max</span>:</div>
   <div class="col-4 pull-left nopadding">{{histogram.max| number:'1.0-2'}}</div>
 
   <ng-container *ngIf="showConfidenceInterval()">
-    <div class="col-8 nopadding" i18n>Confidence interval<span>:</span></div>
+    <div class="col-8 nopadding"><span i18n>Confidence interval</span>:</div>
     <div class="col-4 pull-left nopadding">{{histogram.confidence * 100| number:'1.0-0'}}%</div>
   </ng-container>
 </div>
diff --git a/projects/common-map/src/fm-map/components/legend/statistics-details/statistics-details.component.html b/projects/common-map/src/fm-map/components/legend/statistics-details/statistics-details.component.html
index b9885f5..4fecbaa 100644
--- a/projects/common-map/src/fm-map/components/legend/statistics-details/statistics-details.component.html
+++ b/projects/common-map/src/fm-map/components/legend/statistics-details/statistics-details.component.html
@@ -1,36 +1,36 @@
 <div class="row pl-3">
-  <div class="col-8 nopadding" i18n>Data points<span>:</span></div>
+  <div class="col-8 nopadding"><span i18n>Data points</span>:</div>
   <div class="col-4 pull-left nopadding">{{statistics.populationCount}}</div>
-  <div class="col-8 nopadding" i18n>Min<span>:</span></div>
+  <div class="col-8 nopadding"><span i18n>Min</span>:</div>
   <div class="col-4 pull-left nopadding">{{statistics.min| number:'1.0-2'}}</div>
-  <div class="col-8 nopadding" i18n>Max<span>:</span></div>
+  <div class="col-8 nopadding"><span i18n>Max</span>:</div>
   <div class="col-4 pull-left nopadding">{{statistics.max| number:'1.0-2'}}</div>
-  <div class="col-8 nopadding" i18n>Min+1<span>:</span></div>
+  <div class="col-8 nopadding"><span i18n>Min+1</span>:</div>
   <div class="col-4 pull-left nopadding">{{statistics.minPlus| number:'1.0-2'}}</div>
-  <div class="col-8 nopadding" i18n>Max-1<span>:</span></div>
+  <div class="col-8 nopadding"><span i18n>Max-1</span>:</div>
   <div class="col-4 pull-left nopadding">{{statistics.maxMinus| number:'1.0-2'}}</div>
 
-  <div class="col-8 nopadding" i18n>Average<span>:</span></div>
+  <div class="col-8 nopadding"><span i18n>Average</span>:</div>
   <div class="col-4 pull-left nopadding">{{statistics.mean| number:'1.0-2'}}</div>
-  <div class="col-8 nopadding" i18n>Standard deviation<span>:</span></div>
+  <div class="col-8 nopadding"><span i18n>Standard deviation</span>:</div>
   <div class="col-4 pull-left nopadding">{{statistics.stddev| number:'1.0-2'}}</div>
 
-  <div class="col-8 nopadding" i18n>Mode<span>:</span></div>
+  <div class="col-8 nopadding"><span i18n>Mode</span>:</div>
   <div class="col-4 pull-left nopadding">{{statistics.mode| number:'1.0-2'}}</div>
-  <div class="col-8 nopadding" i18n>Median<span>:</span></div>
+  <div class="col-8 nopadding"><span i18n>Median</span>:</div>
   <div class="col-4 pull-left nopadding">{{statistics.median| number:'1.0-2'}}</div>
 
-  <div class="col-8 nopadding" i18n>Kurtosis<span>:</span></div>
+  <div class="col-8 nopadding"><span i18n>Kurtosis</span>:</div>
   <div class="col-4 pull-left nopadding">{{statistics.curtosis| number:'1.0-2'}}</div>
-  <div class="col-8 nopadding" i18n>Skewness<span>:</span></div>
+  <div class="col-8 nopadding"><span i18n>Skewness</span>:</div>
   <div class="col-4 pull-left nopadding">{{statistics.skewness| number:'1.0-2'}}</div>
 
-  <div class="col-8 nopadding" i18n>Variance<span>:</span></div>
+  <div class="col-8 nopadding"><span i18n>Variance</span>:</div>
   <div class="col-4 pull-left nopadding">{{statistics.variance| number:'1.0-2'}}</div>
-  <div class="col-8 nopadding" i18n>Coefficient of variation<span>:</span></div>
+  <div class="col-8 nopadding"><span i18n>Coefficient of variation</span>:</div>
   <div class="col-4 pull-left nopadding">{{statistics.variationCoefficient | number:'1.0-2'}}</div>
   <ng-container *ngIf="statistics.confidenceIntervalLow !== undefined">
-    <div class="col-8 nopadding">90% <span i18n>Confidence interval</span><span>:</span></div>
+    <div class="col-8 nopadding">90% <span i18n>Confidence interval</span>:</div>
     <div class="col-4 pull-left nopadding">{{statistics.confidenceIntervalLow | number:'1.0-2'}} - {{statistics.confidenceIntervalHigh | number:'1.0-2'}}</div>
   </ng-container>
 </div>
diff --git a/projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.html b/projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.html
index 10ef92f..aa205a3 100644
--- a/projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.html
+++ b/projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.html
@@ -36,7 +36,10 @@
       <div class="card menu-card">
         <ul class="p-0 mt-2">
           <li *ngIf="item.isEditable"><a href="#" class="mt-1 mr-1" (click)="handleOnEdit(item)"><i class="fa fa-pencil" aria-hidden="true" i18n-title title="Edit"></i>&nbsp;<span i18n>Edit</span></a></li>
-          <li *ngIf="itemTypeService.isLayer(item)"><a href="#" (click)="handleAddAsLayer(item,itemLayer.layerIndex)" class="mt-1 mr-1"><i class="fa fa-eye" aria-hidden="true" i18n-title title="Add as layer"></i>&nbsp;<span i18n>Add as overlay</span></a></li>
+          <ng-container *ngIf="itemTypeService.isLayer(item)">
+            <li *ngIf="!getItemLayer(item,itemLayer.layerIndex)"><a   href="#" (click)="handleAddAsLayer(item,itemLayer.layerIndex)"><i class="fa fa-eye" aria-hidden="true" i18n-title title="Add as layer"></i>&nbsp;<span i18n>Add as overlay</span></a></li>
+            <li *ngIf="getItemLayer(item,itemLayer.layerIndex)"><a  href="#" (click)="handleRemoveLayer(item,itemLayer.layerIndex)"><i class="fa fa-eye" aria-hidden="true" i18n-title title="Remove overlay"></i>&nbsp;<span i18n>Remove overlay</span></a></li>
+          </ng-container>
           <li><a href="#" (click)="handleGoToChart(item)"><i class="fa fa-line-chart" aria-hidden="true" i18m-title title="Show chart"></i>&nbsp;<span i18n>Show chart</span></a></li>
         </ul>
       </div>
diff --git a/projects/common-map/src/fm-map/effects/map.effects.ts b/projects/common-map/src/fm-map/effects/map.effects.ts
index 4e17cf7..d26b101 100644
--- a/projects/common-map/src/fm-map/effects/map.effects.ts
+++ b/projects/common-map/src/fm-map/effects/map.effects.ts
@@ -150,8 +150,10 @@ export class MapEffects {
           for (let f of action.features) {
             extend(extent, (f as Feature).getGeometry().getExtent());
           }
+          if(action.features && action.features.length >0) {
+            actions.push(new mapActions.SetExtent(extent));
+          }  
         }
-        actions.push(new mapActions.SetExtent(extent));
       }
       return actions;
     }));
diff --git a/projects/common/src/fm/components/menu-background/menu-background.component.scss b/projects/common/src/fm/components/menu-background/menu-background.component.scss
index 8622cf5..0ce509b 100644
--- a/projects/common/src/fm/components/menu-background/menu-background.component.scss
+++ b/projects/common/src/fm/components/menu-background/menu-background.component.scss
@@ -7,7 +7,7 @@
     bottom:0;
     opacity: 0;
     background-color: #000000;
-    transition: opacity 0s ease-out 1s;
+    transition: opacity 0.3s ease-out;
     pointer-events: none;
     z-index:99;
 }
diff --git a/projects/common/src/fm/services/event.service.ts b/projects/common/src/fm/services/event.service.ts
index d71e489..a0eb406 100644
--- a/projects/common/src/fm/services/event.service.ts
+++ b/projects/common/src/fm/services/event.service.ts
@@ -42,8 +42,8 @@ export class EventService {
   }
 
   private Authenticate() {
-    var accessToken = this.oauthService.getAccessToken();
-    if (accessToken) {
+    var accessToken = this.oauthService.getAccessToken();   
+    if (this.oauthService.hasValidAccessToken()) {
       this._connection.send('authenticate', this.oauthService.getAccessToken());
       this.authenticated=true;
     } else {