diff --git a/src/public/javascripts/dialogs/note_revisions.js b/src/public/javascripts/dialogs/note_revisions.js
index 890e6de39..9019119b6 100644
--- a/src/public/javascripts/dialogs/note_revisions.js
+++ b/src/public/javascripts/dialogs/note_revisions.js
@@ -8,6 +8,7 @@ const $content = $("#note-revision-content");
 const $title = $("#note-revision-title");
 
 let revisionItems = [];
+let note;
 
 async function showCurrentNoteRevisions() {
     await showNoteRevisionsDialog(noteDetailService.getCurrentNoteId());
@@ -21,6 +22,7 @@ async function showNoteRevisionsDialog(noteId, noteRevisionId) {
     $list.empty();
     $content.empty();
 
+    note = noteDetailService.getCurrentNote();
     revisionItems = await server.get('notes/' + noteId + '/revisions');
 
     for (const item of revisionItems) {
@@ -51,12 +53,15 @@ $list.on('change', () => {
 
     $title.html(revisionItem.title);
 
-    if (revisionItem.type === 'text') {
+    if (note.type === 'text') {
         $content.html(revisionItem.content);
     }
-    else if (revisionItem.type === 'code') {
+    else if (note.type === 'code') {
         $content.html($("<pre>").text(revisionItem.content));
     }
+    else {
+        $content.text("Preview isn't available for this note type.");
+    }
 });
 
 $(document).on('click', "a[data-action='note-revision']", event => {
diff --git a/src/public/javascripts/services/note_detail_relation_map.js b/src/public/javascripts/services/note_detail_relation_map.js
index 8cf1c599b..4655223f9 100644
--- a/src/public/javascripts/services/note_detail_relation_map.js
+++ b/src/public/javascripts/services/note_detail_relation_map.js
@@ -91,6 +91,14 @@ function loadMapData() {
     }
 }
 
+function noteIdToId(noteId) {
+    return "note-" + noteId;
+}
+
+function idToNoteId(id) {
+    return id.substr(5);
+}
+
 async function show() {
     $component.show();
 
@@ -109,7 +117,7 @@ async function show() {
 }
 
 async function loadNotesAndRelations() {
-    const noteIds = mapData.notes.map(note => note.id);
+    const noteIds = mapData.notes.map(note => note.noteId);console.log(noteIds);
     const data = await server.post("notes/relation-map", {noteIds});
 
     relations = [];
@@ -131,7 +139,7 @@ async function loadNotesAndRelations() {
         relations.push(relation);
     }
 
-    mapData.notes = mapData.notes.filter(note => note.id in data.noteTitles);
+    mapData.notes = mapData.notes.filter(note => note.noteId in data.noteTitles);
 
     // delete all endpoints and connections
     // this is done at this point (after async operations) to reduce flicker to the minimum
@@ -139,9 +147,9 @@ async function loadNotesAndRelations() {
 
     jsPlumbInstance.batch(async function () {
         for (const note of mapData.notes) {
-            const title = data.noteTitles[note.id];
+            const title = data.noteTitles[note.noteId];
 
-            await createNoteBox(note.id, title, note.x, note.y);
+            await createNoteBox(note.noteId, title, note.x, note.y);
         }
 
         for (const relation of relations) {
@@ -150,8 +158,8 @@ async function loadNotesAndRelations() {
             }
 
             const connection = jsPlumbInstance.connect({
-                source: relation.sourceNoteId,
-                target: relation.targetNoteId,
+                source: noteIdToId(relation.sourceNoteId),
+                target: noteIdToId(relation.targetNoteId),
                 type: relation.type
             });
 
@@ -170,8 +178,8 @@ async function loadNotesAndRelations() {
 
         for (const link of data.links) {
             jsPlumbInstance.connect({
-                source: link.sourceNoteId,
-                target: link.targetNoteId,
+                source: noteIdToId(link.sourceNoteId),
+                target: noteIdToId(link.targetNoteId),
                 type: 'link'
             });
         }
@@ -195,9 +203,9 @@ function initPanZoom() {
                 x -= 80;
                 y -= 15;
 
-                createNoteBox(clipboard.id, clipboard.title, x, y);
+                createNoteBox(clipboard.noteId, clipboard.title, x, y);
 
-                mapData.notes.push({ id: clipboard.id, x, y });
+                mapData.notes.push({ noteId: clipboard.noteId, x, y });
 
                 clipboard = null;
             }
@@ -337,8 +345,8 @@ async function connectionCreatedHandler(info, originalEvent) {
         return;
     }
 
-    const targetNoteId = connection.target.id;
-    const sourceNoteId = connection.source.id;
+    const targetNoteId = idToNoteId(connection.target.id);
+    const sourceNoteId = idToNoteId(connection.source.id);
 
     const relationExists = relations.some(rel =>
         rel.targetNoteId === targetNoteId
@@ -382,7 +390,7 @@ async function noteContextMenuHandler(event, cmd) {
 
         jsPlumbInstance.remove(noteId);
 
-        mapData.notes = mapData.notes.filter(note => note.id !== noteId);
+        mapData.notes = mapData.notes.filter(note => note.noteId !== noteId);
 
         relations = relations.filter(relation => relation.sourceNoteId !== noteId && relation.targetNoteId !== noteId);
 
@@ -408,11 +416,11 @@ function saveData() {
     noteDetailService.noteChanged();
 }
 
-async function createNoteBox(id, title, x, y) {
+async function createNoteBox(noteId, title, x, y) {
     const $noteBox = $("<div>")
         .addClass("note-box")
-        .prop("id", id)
-        .append($("<span>").addClass("title").html(await linkService.createNoteLink(id, title)))
+        .prop("id", noteIdToId(noteId))
+        .append($("<span>").addClass("title").html(await linkService.createNoteLink(noteId, title)).append(`[${Math.floor(x)}, ${Math.floor(y)}]`))
         .append($("<div>").addClass("endpoint").attr("title", "Start dragging relations from here and drop them on another note."))
         .css("left", x + "px")
         .css("top", y + "px");
@@ -423,10 +431,12 @@ async function createNoteBox(id, title, x, y) {
         start: params => {},
         drag: params => {},
         stop: params => {
-            const note = mapData.notes.find(note => note.id === params.el.id);
+            const noteId = idToNoteId(params.el.id);
+
+            const note = mapData.notes.find(note => note.noteId === noteId);
 
             if (!note) {
-                console.error(`Note ${params.el.id} not found!`);
+                console.error(`Note ${noteId} not found!`);
                 return;
             }
 
@@ -477,7 +487,7 @@ $createChildNote.click(async () => {
     // no need to wait for it to finish
     treeService.reload();
 
-    clipboard = { id: note.noteId, title };
+    clipboard = { noteId: note.noteId, title };
 });
 
 function getZoom() {
@@ -557,7 +567,11 @@ $centerButton.click(() => {
     let averageX = totalX / mapData.notes.length;
     let averageY = totalY / mapData.notes.length;
 
-    pzInstance.moveTo(averageX, averageY);
+    const $noteBox = $("#C1I7GPA8ORO4");
+
+    console.log($noteBox);
+
+    pzInstance.centerOn($noteBox[0], $relationMapContainer[0]);
 });
 
 $component.on("drop", dropNoteOntoRelationMapHandler);
diff --git a/src/public/javascripts/services/tooltip.js b/src/public/javascripts/services/tooltip.js
index 36273e4cb..f9e6d0205 100644
--- a/src/public/javascripts/services/tooltip.js
+++ b/src/public/javascripts/services/tooltip.js
@@ -49,9 +49,12 @@ function setupTooltip() {
         }
     });
 
-    $(document).on("mouseleave", "a", async function() {
+    $(document).on("mouseleave", "a", function() {
         $(this).tooltip('hide');
     });
+
+    // close any tooltip after click, this fixes the problem that sometimes tooltips remained on the screen
+    $(document).on("click", () => $('[rel=tooltip]').tooltip("hide"));
 }
 
 async function renderTooltip(note, attributes) {