diff --git a/js/app/map/map.js b/js/app/map/map.js
index fd5a7cdc..e5db21d4 100644
--- a/js/app/map/map.js
+++ b/js/app/map/map.js
@@ -178,7 +178,7 @@ define([
                             })
                         ).append(
                             $('<i>', {
-                                class: ['fa', 'fa-fw', 'fa-circle', config.systemBodyItemStatusClass, statusClass].join(' ')
+                                class: ['fa', 'fa-circle', config.systemBodyItemStatusClass, statusClass].join(' ')
                             })
                         ).append(
                             $('<span>', {
@@ -209,7 +209,7 @@ define([
 
                 tooltipOptions.id = systemId;
                 tooltipOptions.highlight = highlight;
-                tooltipOptions.title = '<i class="fa ' + tooltipIconClass + '"></i>';
+                tooltipOptions.title = "<i class='fa " + tooltipIconClass + "'></i>";
                 tooltipOptions.title += '&nbsp;' + userCounter;
 
                 // show system head
@@ -224,13 +224,11 @@ define([
                     },
                     complete: function(){
                         // show system body
-                        system.toggleBody(true, map, {complete: function(){
+                        system.toggleBody(true, map, {complete: function(system){
                             // complete callback function
                             // show active user tooltip
                             system.toggleSystemTooltip('show', tooltipOptions);
                         }});
-
-
                     }
                 });
             }
@@ -285,10 +283,8 @@ define([
                     map.revalidate( systemDomId );
 
                     if(callback.complete){
-                        callback.complete();
+                        callback.complete(system);
                     }
-
-
                 }
             });
         }else if(type === false){
@@ -363,6 +359,7 @@ define([
                     tooltipActive === false &&
                     options.id
                 ){
+
                     // init new tooltip
                     tooltipId = config.systemTooltipInnerIdPrefix + options.id;
 
@@ -2971,7 +2968,7 @@ define([
                         // add  "user count" to "total map user count"
                         headerUpdateData.userCount += tempUserData.user.length;
 
-                        // remove system from "search" array -> speed up
+                        // remove system from "search" array -> speed up loop
                         userData.data.systems.splice(j, 1);
                     }
                 }
diff --git a/public/templates/dialog/delete_account.html b/public/templates/dialog/delete_account.html
index ff7203b2..ec499625 100644
--- a/public/templates/dialog/delete_account.html
+++ b/public/templates/dialog/delete_account.html
@@ -61,7 +61,7 @@
             </div>
 
             <div class="alert alert-warning">
-                <span class="txt-color txt-color-warning">Delete account</span>
+                <span class="txt-color txt-color-warning">Warning</span>
                 <small>This will permanently remove your account!</small>
             </div>
 
diff --git a/public/templates/view/landingpage.html b/public/templates/view/landingpage.html
index 214980ac..c32dec2c 100644
--- a/public/templates/view/landingpage.html
+++ b/public/templates/view/landingpage.html
@@ -703,7 +703,7 @@
                     I wanted to make the easiest to use and most powerful 3rd party system mapper, build with the newest web technology available.
                 </p>
                 <p>
-                    I am currently working as a professional software developer for one of the larges German web pages.
+                    I am currently working as a professional software developer for one of the largest German web pages.
                     The main focus of my daily work is based on large scale frontend applications.
                 </p>
                 <p>
@@ -845,13 +845,13 @@
                     Feel free to contact me with your problem, either by submitting a <a target="_blank" href="https://github.com/exodus4d/pathfinder/issues">bug report</a> or contact me in game.
                     I´ll give my best to find a solution for your problem or path <em>Pathfinder</em>.
                 </p>
-                <h3>I don´t trust you, can i host <em>Pathfinder</em> on my own webserver?</h3>
+                <h3>I don´t trust you, can I host <em>Pathfinder</em> on my own webserver?</h3>
                 <p>
                     Yes you can! I developed this application for the great community of <em>EVE Online</em>.
                     The program code is open source and can be used by anyone who have the required software skills.
                     Please make sure to keep all 3rd party plugin licence and respect them.
                     At the moment there is no developer guide available. But one the beta phase is finished, i will probably write a short technical documentation.
-                    Do not expect any "out of the boy" install routine at this point.
+                    Do not expect any "out of the box" install routine at this point.
                     <br>
                     Server requirements:
                 </p>