diff --git a/src/app/components/toolbar/toolbar.component.html b/src/app/components/toolbar/toolbar.component.html
index fa684ba..6a1ec63 100644
--- a/src/app/components/toolbar/toolbar.component.html
+++ b/src/app/components/toolbar/toolbar.component.html
@@ -6,7 +6,7 @@
     <div class="ml-auto">
         <ng-container *ngFor="let item of menuItems; let i = index">
             <ng-container *ngIf="i < maxMenuItems">
-                <ng-container *ngTemplateOutlet="menuItem; context: {$implicit: item, mode: 'icon'}"></ng-container>
+                <ng-container *ngTemplateOutlet="menuItem; context: {$implicit: item, menu: menuItems, mode: 'icon'}"></ng-container>
             </ng-container>
         </ng-container>
         <button *ngIf="menuItems.length > maxMenuItems" mat-icon-button [matMenuTriggerFor]="overflowMenu">
@@ -15,41 +15,41 @@
         <mat-menu #overflowMenu="matMenu">
             <ng-container *ngFor="let item of menuItems; let i = index">
                 <ng-container *ngIf="i >= maxMenuItems">
-                    <ng-container *ngTemplateOutlet="menuItem; context: {$implicit: item, mode: 'menu'}"></ng-container>
+                    <ng-container *ngTemplateOutlet="menuItem; context: {$implicit: item, menu: menuItems, mode: 'menu'}"></ng-container>
                 </ng-container>
             </ng-container>
         </mat-menu>
     </div>
 </mat-toolbar>
 
-<ng-template #menuItem let-item let-mode="mode">
+<ng-template #menuItem let-item let-menu="menu" let-mode="mode">
     <ng-container *ngIf="mode == 'icon' && !item.subMenu">
-        <button mat-icon-button class="d-inline mr-1" [ngClass]="{'selected': item?.enabled}" (click)="clickWrapper(item)" [matTooltip]="item.name">
+        <button mat-icon-button class="d-inline mr-1" [ngClass]="{'selected': item?.enabled}" (click)="clickWrapper(item, menu)" [matTooltip]="item.name">
             <mat-icon *ngIf="item.icon">{{item.icon}}</mat-icon>
         </button>
     </ng-container>
     <ng-container *ngIf="mode == 'menu' && !item.subMenu">
-        <button mat-menu-item [ngClass]="{'selected': item?.enabled}" (click)="clickWrapper(item)">
+        <button mat-menu-item [ngClass]="{'selected': item?.enabled}" (click)="clickWrapper(item, menu)">
             <mat-icon *ngIf="item.icon">{{item.icon}}</mat-icon> {{item?.name}}
         </button>
     </ng-container>
     <ng-container *ngIf="mode == 'icon' && item.subMenu">
-        <button mat-icon-button class="d-inline mr-1" [ngClass]="{'selected': item?.enabled}" (click)="clickWrapper(item)" [matTooltip]="item.name" [matMenuTriggerFor]="subMenu">
+        <button mat-icon-button class="d-inline mr-1" [ngClass]="{'selected': item?.enabled}" (click)="clickWrapper(item, menu)" [matTooltip]="item.name" [matMenuTriggerFor]="subMenu">
             <mat-icon *ngIf="item.icon">{{item.icon}}</mat-icon>
         </button>
         <mat-menu #subMenu="matMenu">
             <ng-container *ngFor="let child of item.subMenu">
-                <ng-container *ngTemplateOutlet="menuItem; context: {$implicit: child, mode: 'menu'}"></ng-container>
+                <ng-container *ngTemplateOutlet="menuItem; context: {$implicit: child, menu: item.subMenu, mode: 'menu'}"></ng-container>
             </ng-container>
         </mat-menu>
     </ng-container>
     <ng-container *ngIf="mode == 'menu' && item.subMenu">
-        <button mat-menu-item [ngClass]="{'selected': item?.enabled}" (click)="clickWrapper(item)" [matMenuTriggerFor]="subMenu">
+        <button mat-menu-item [ngClass]="{'selected': item?.enabled}" (click)="clickWrapper(item, menu)" [matMenuTriggerFor]="subMenu">
             <mat-icon *ngIf="item.icon">{{item.icon}}</mat-icon> {{item?.name}}
         </button>
         <mat-menu #subMenu="matMenu">
             <ng-container *ngFor="let child of item.subMenu">
-                <ng-container *ngTemplateOutlet="menuItem; context: {$implicit: child, mode: 'menu'}"></ng-container>
+                <ng-container *ngTemplateOutlet="menuItem; context: {$implicit: child, menu: item.subMenu, mode: 'menu'}"></ng-container>
             </ng-container>
         </mat-menu>
     </ng-container>
diff --git a/src/app/components/toolbar/toolbar.component.ts b/src/app/components/toolbar/toolbar.component.ts
index 0515fdb..d3d0d2f 100644
--- a/src/app/components/toolbar/toolbar.component.ts
+++ b/src/app/components/toolbar/toolbar.component.ts
@@ -23,10 +23,10 @@ export class ToolbarComponent implements AfterViewInit {
         setTimeout(() => this.maxMenuItems = Math.floor((document.getElementById('toolbar').offsetWidth - 200) / 75), 1);
     }
 
-    clickWrapper(item: ToolbarItem) {
+    clickWrapper(item: ToolbarItem, menu?: ToolbarItem[]) {
         if(item.toggle) {
-            if (item.individualToggle) {
-                this.menuItems.filter(i2 => item.name != i2.name && i2.individualToggle).forEach(item => {
+            if (!item.individualToggle) {
+                menu.filter(i => item.name != i.name && !i.individualToggle).forEach(item => {
                     item.enabled = false;
                     if (item.onDisabled) item.onDisabled();
                 });
diff --git a/src/app/views/map/map.component.ts b/src/app/views/map/map.component.ts
index c8af194..8211bfb 100644
--- a/src/app/views/map/map.component.ts
+++ b/src/app/views/map/map.component.ts
@@ -25,21 +25,21 @@ export class MapComponent implements OnInit {
     showPalette = false;
 
     menu: ToolbarItem[] = [
-        {name: 'Marker', icon: 'room', toggle: true, individualToggle: true, click: () => this.addMarker()},
-        {name: 'Draw', icon: 'create', toggle: true, individualToggle: true, onEnabled: () => this.startDrawing(), onDisabled: () => this.endDrawing()},
-        {name: 'Measure', icon: 'straighten', toggle: true, individualToggle: true, click: () => this.measure()},
-        {name: 'Delete', icon: 'delete', toggle: true, individualToggle: true, onEnabled: () => this.map.deleteMode = true, onDisabled: () => this.map.deleteMode = false},
-        {name: 'Map Style', icon: 'terrain', toggle: true, subMenu: [
-            {name: 'ESRI:Topographic', click: () => this.map.setMapLayer(MapLayers.ESRI_TOPOGRAPHIC)},
-            {name: 'ESRI:Satelite', click: () => this.map.setMapLayer(MapLayers.ESRI_IMAGERY)},
-            {name: 'ESRI:Satelite Clear', click: () => this.map.setMapLayer(MapLayers.ESRI_IMAGERY_CLARITY)}
+        {name: 'Marker', icon: 'room', click: () => this.addMarker()},
+        {name: 'Draw', icon: 'create', toggle: true, onEnabled: () => this.startDrawing(), onDisabled: () => this.endDrawing()},
+        {name: 'Measure', icon: 'straighten', toggle: true, click: () => this.measure()},
+        {name: 'Delete', icon: 'delete', toggle: true, onEnabled: () => this.map.deleteMode = true, onDisabled: () => this.map.deleteMode = false},
+        {name: 'Map Style', icon: 'terrain', subMenu: [
+            {name: 'ESRI:Topographic', toggle: true, click: () => this.map.setMapLayer(MapLayers.ESRI_TOPOGRAPHIC)},
+            {name: 'ESRI:Satellite', toggle: true, click: () => this.map.setMapLayer(MapLayers.ESRI_IMAGERY)},
+            {name: 'ESRI:Satellite Clear', toggle: true, enabled: true, click: () => this.map.setMapLayer(MapLayers.ESRI_IMAGERY_CLARITY)}
         ]},
-        {name: 'Weather', icon: 'cloud', toggle: true, subMenu: [
-                {name: 'None', click: () => this.map.setWeatherLayer()},
-                {name: 'Temperature', click: () => this.map.setWeatherLayer(WeatherLayers.TEMP_NEW)},
-                {name: 'Wind', click: () => this.map.setWeatherLayer(WeatherLayers.WIND_NEW)},
-                {name: 'Sea Level Pressure', click: () => this.map.setWeatherLayer(WeatherLayers.SEA_LEVEL_PRESSURE)},
-                {name: 'Clouds', click: () => this.map.setWeatherLayer(WeatherLayers.CLOUDS_NEW)},
+        {name: 'Weather', icon: 'cloud', subMenu: [
+                {name: 'None', toggle: true, enabled: true, click: () => this.map.setWeatherLayer()},
+                {name: 'Temperature', toggle: true, click: () => this.map.setWeatherLayer(WeatherLayers.TEMP_NEW)},
+                {name: 'Wind', toggle: true, click: () => this.map.setWeatherLayer(WeatherLayers.WIND_NEW)},
+                {name: 'Sea Level Pressure', toggle: true, click: () => this.map.setWeatherLayer(WeatherLayers.SEA_LEVEL_PRESSURE)},
+                {name: 'Clouds', toggle: true, click: () => this.map.setWeatherLayer(WeatherLayers.CLOUDS_NEW)},
         ]},
         {name: 'Calibrate', icon: 'explore', click: () => this.calibrate()},
         {name: 'Messages', icon: 'chat', hidden: true},