diff --git a/pandora_console/include/functions_pandora_networkmap.php b/pandora_console/include/functions_pandora_networkmap.php
index 6ffa9a67ab..9d33bf2a09 100644
--- a/pandora_console/include/functions_pandora_networkmap.php
+++ b/pandora_console/include/functions_pandora_networkmap.php
@@ -1239,7 +1239,7 @@ function show_networkmap($id = 0, $user_readonly = false, $nodes_and_relations =
 				</a>
 			</div>';
 			
-			echo '<div id="hide_labels" style="position: absolute; right: 0px; top: 0px;">
+			echo '<div id="hide_labels" style="position: absolute; right: 10px; top: 10px;">
 					<a title="' . __('Hide Labels') . '" href="javascript: hide_labels();">
 						<img id="image_hide_show_labels" src="images/delete.png" />
 					</a>
diff --git a/pandora_console/include/javascript/functions_pandora_networkmap.js b/pandora_console/include/javascript/functions_pandora_networkmap.js
index 493e9cc515..f73bd08543 100644
--- a/pandora_console/include/javascript/functions_pandora_networkmap.js
+++ b/pandora_console/include/javascript/functions_pandora_networkmap.js
@@ -8,14 +8,23 @@ function draw_minimap() {
 	context_minimap.fillStyle = "#ddd";
 	context_minimap.fillRect(0, 0, minimap_w, minimap_h);
 	
+	var relation_min_nodes = minimap_relation;
+	var relation_minimap_w = 2;
+	var relation_minimap_h = 2;
+	if (graph.nodes.length > 100) {
+		relation_min_nodes = 0.01;
+		relation_minimap_w = 2.5;
+		relation_minimap_h = 1.5;
+	}
+	
 	//Draw the items and lines
 	jQuery.each(graph.nodes, function (key, value) {
 		if (typeof(value) == 'undefined') return;
 		
 		context_minimap.beginPath();
 		//Paint the item
-		center_orig_x = (value.x + value.image_width / 2) * minimap_relation;
-		center_orig_y = (value.y + value.image_height / 2) * minimap_relation;
+		center_orig_x = (value.x + value.image_width / 4) * relation_min_nodes + minimap_w / relation_minimap_w;
+		center_orig_y = (value.y + value.image_height / 4) * relation_min_nodes + minimap_h / relation_minimap_h;
 		
 		context_minimap.arc(center_orig_x,
 			center_orig_y, 2, 0, Math.PI * 2, false);
@@ -33,10 +42,10 @@ function draw_minimap() {
 	context_minimap.beginPath();
 	context_minimap.strokeStyle = "#3f3f3f";
 	context_minimap.strokeRect(
-		(-translation[0] / scale) * minimap_relation,
-		(-translation[1] / scale) * minimap_relation,
-		width_svg * minimap_relation / scale,
-		height_svg * minimap_relation / scale);
+		(-translation[0] / scale) * relation_min_nodes + minimap_w / relation_minimap_w,
+		(-translation[1] / scale) * relation_min_nodes + minimap_h / relation_minimap_h,
+		width_svg * relation_min_nodes / scale,
+		height_svg * relation_min_nodes / scale);
 	
 	context_minimap.beginPath();
 	context_minimap.strokeStyle = "#82B92E";
diff --git a/pandora_console/include/javascript/jquery.contextMenu.css b/pandora_console/include/javascript/jquery.contextMenu.css
index 5e651855d8..7a2c5e911d 100644
--- a/pandora_console/include/javascript/jquery.contextMenu.css
+++ b/pandora_console/include/javascript/jquery.contextMenu.css
@@ -21,7 +21,6 @@
     display: inline-block;
     position: absolute;
     list-style-type: none;
-    
     border: 1px solid #DDD;
 	border-radius: 4px;
     background: #EEE;
@@ -38,7 +37,7 @@
 }
 
 .context-menu-item {
-    padding: 2px 2px 2px 24px;
+    padding: 0px 2px 0px 24px;
     background-color: #EEE;
     position: relative;
 	border-radius: 4px;
@@ -46,6 +45,8 @@
        -moz-user-select: -moz-none;
         -ms-user-select: none;
             user-select: none;
+	padding-top: 8px;
+	padding-bottom: 8px;
 }
 
 .context-menu-item span {