diff --git a/src/app/cartography/widgets/drawing.ts b/src/app/cartography/widgets/drawing.ts
index 7428904b..307a826c 100644
--- a/src/app/cartography/widgets/drawing.ts
+++ b/src/app/cartography/widgets/drawing.ts
@@ -46,6 +46,10 @@ export class DrawingWidget implements Widget {
       .attr('transform', (d: MapDrawing) => {
         return `translate(${d.x},${d.y}) rotate(${d.rotation})`;
       });
+    
+    this.drawingWidgets.forEach((widget) => {
+      widget.draw(drawing_body_merge);
+    });
 
     drawing_body_merge
       .select<SVGAElement>('line.top')
@@ -112,11 +116,7 @@ export class DrawingWidget implements Widget {
         .attr("cursor", "move");
 
     drawing_body_merge
-      .classed('selected', (n: MapDrawing) => this.selectionManager.isSelected(n));
-    
-    this.drawingWidgets.forEach((widget) => {
-      widget.draw(drawing_body_merge);
-    });
+      .classed('drawing_selected', (n: MapDrawing) => this.selectionManager.isSelected(n));
 
   }
 }
diff --git a/src/app/components/project-map/project-map.component.css b/src/app/components/project-map/project-map.component.css
index 0b966363..29992d74 100644
--- a/src/app/components/project-map/project-map.component.css
+++ b/src/app/components/project-map/project-map.component.css
@@ -31,6 +31,10 @@ g.node:hover {
   outline: none;
 }
 
+.mat-drawer-content {
+  display: inline !important;
+}
+
 .drawer-container {
   height: 72px !important;
   background: transparent;
diff --git a/src/app/components/project-map/project-map.component.ts b/src/app/components/project-map/project-map.component.ts
index 2b752cdf..7aaf15ee 100644
--- a/src/app/components/project-map/project-map.component.ts
+++ b/src/app/components/project-map/project-map.component.ts
@@ -45,10 +45,8 @@ import { MapLabel } from '../../cartography/models/map/map-label';
 import { D3MapComponent } from '../../cartography/components/d3-map/d3-map.component';
 import { MapLinkNode } from '../../cartography/models/map/map-link-node';
 import { TextElement } from '../../cartography/models/drawings/text-element';
-import { FontFixer } from '../../cartography/helpers/font-fixer';
 import { MapLabelToLabelConverter } from '../../cartography/converters/map/map-label-to-label-converter';
 import { select } from 'd3-selection';
-import { delay } from 'q';
 
 
 @Component({