diff --git a/src/public/app/widgets/attribute_widgets/attribute_editor.js b/src/public/app/widgets/attribute_widgets/attribute_editor.js
index 96890e096..f06d49c8f 100644
--- a/src/public/app/widgets/attribute_widgets/attribute_editor.js
+++ b/src/public/app/widgets/attribute_widgets/attribute_editor.js
@@ -483,21 +483,6 @@ export default class AttributeEditorWidget extends NoteContextAwareWidget {
         }
     }
 
-    async focusOnAttributesEvent({ntxId}) {
-        if (this.noteContext.ntxId === ntxId) {
-            if (this.$editor.is(":visible")) {
-                this.$editor.trigger('focus');
-
-                this.textEditor.model.change(writer => { // put focus to the end of the content
-                    writer.setSelection(writer.createPositionAt(this.textEditor.model.document.getRoot(), 'end'));
-                });
-            }
-            else {
-                this.triggerEvent('focusOnDetail', {ntxId: this.noteContext.ntxId});
-            }
-        }
-    }
-
     async createNoteForReferenceLink(title) {
         const {note} = await noteCreateService.createNote(this.notePath, {
             activate: false,
diff --git a/src/public/app/widgets/note_map.js b/src/public/app/widgets/note_map.js
index 1aa21a266..0c02fe7c2 100644
--- a/src/public/app/widgets/note_map.js
+++ b/src/public/app/widgets/note_map.js
@@ -21,13 +21,13 @@ const TPL = `<div class="note-map-widget" style="position: relative;">
         }
         
         .map-type-switcher .bx {
-            font-size: x-large;
+            font-size: 120%;
         }
     </style>
     
-    <div class="btn-group btn-group-sm map-type-switcher" role="group">
-      <button type="button" class="btn btn-secondary" title="Link Map" data-type="link"><span class="bx bx-network-chart"></span></button>
-      <button type="button" class="btn btn-secondary" title="Tree map" data-type="tree"><span class="bx bx-sitemap"></span></button>
+    <div class="btn-group btn-group-sm map-type-switcher floating-button" role="group">
+      <button type="button" class="btn icon-button bx bx-network-chart" title="Link Map" data-type="link"></button>
+      <button type="button" class="btn icon-button bx bx-sitemap" title="Tree map" data-type="tree"></button>
     </div>
 
     <div class="style-resolver"></div>
@@ -102,7 +102,7 @@ export default class NoteMapWidget extends NoteContextAwareWidget {
             })
             .nodeLabel(node => node.name)
             .maxZoom(7)
-            .warmupTicks(10)
+            .warmupTicks(30)
             .linkDirectionalArrowLength(5)
             .linkDirectionalArrowRelPos(1)
             .linkWidth(1)
@@ -122,8 +122,8 @@ export default class NoteMapWidget extends NoteContextAwareWidget {
         const nodeLinkRatio = data.nodes.length / data.links.length;
 
         this.graph.d3Force('link').distance(40);
-        this.graph.d3Force('center').strength(0.01);
-        this.graph.d3Force('charge').strength(-20 / nodeLinkRatio);
+        this.graph.d3Force('center').strength(0.2);
+        this.graph.d3Force('charge').strength(-20 / Math.pow(nodeLinkRatio, 1.5));
         this.graph.d3Force('charge').distanceMax(1000);
 
         this.renderData(data);
diff --git a/src/public/app/widgets/note_title.js b/src/public/app/widgets/note_title.js
index 71cf0db42..a8d5b5efc 100644
--- a/src/public/app/widgets/note_title.js
+++ b/src/public/app/widgets/note_title.js
@@ -61,7 +61,7 @@ export default class NoteTitleWidget extends NoteContextAwareWidget {
         });
 
         utils.bindElShortcut(this.$noteTitle, 'return', () => {
-            this.triggerCommand('focusOnAttributes', {ntxId: this.noteContext.ntxId});
+            this.triggerCommand('focusOnDetail', {ntxId: this.noteContext.ntxId});
         });
     }
 
diff --git a/src/public/app/widgets/type_widgets/type_widget.js b/src/public/app/widgets/type_widgets/type_widget.js
index 6c3376add..aece96078 100644
--- a/src/public/app/widgets/type_widgets/type_widget.js
+++ b/src/public/app/widgets/type_widgets/type_widget.js
@@ -55,6 +55,9 @@ export default class TypeWidget extends NoteContextAwareWidget {
             // won't trigger .refresh();
             return super.handleEventInChildren('setNoteContext', data);
         }
+        else if (name === 'entitiesReloaded') {
+            return super.handleEventInChildren(name, data);
+        }
         else {
             return Promise.resolve();
         }
diff --git a/src/routes/api/note_map.js b/src/routes/api/note_map.js
index 173ab97c4..be384c839 100644
--- a/src/routes/api/note_map.js
+++ b/src/routes/api/note_map.js
@@ -70,10 +70,13 @@ function getLinkMap(req) {
 
 function getTreeMap(req) {
     const mapRootNote = becca.getNote(req.params.noteId);
+    // if the map root itself has ignore (journal typically) then there wouldn't be anything to display so
+    // we'll just ignore it
+    const ignoreExcludeFromTreeMap = mapRootNote.hasLabel('excludeFromTreeMap');
     const noteIds = new Set();
 
     const notes = mapRootNote.getSubtreeNotes(false)
-        .filter(note => !note.hasLabel('excludeFromTreeMap'))
+        .filter(note => ignoreExcludeFromTreeMap || !note.hasLabel('excludeFromTreeMap'))
         .filter(note => {
             if (note.type !== 'image' || note.getChildNotes().length > 0) {
                 return true;