diff --git a/html/index.html b/html/index.html
index 2ddd5db..2d881aa 100644
--- a/html/index.html
+++ b/html/index.html
@@ -615,7 +615,7 @@
 						<div id="F" title="(F)ollow" class="button inActiveButton" onclick="toggleFollowSelected();"><span class="buttonText">F</span></div>
 					</div>
 				</div>
-			</div>
+			</div> <!-- map_container-->
 
 			<div id="sidebar_container">
 				<div id="splitter" class="ui-resizable-handle ui-resizable-w"></div>
diff --git a/html/script.js b/html/script.js
index 4b50318..f5a4df9 100644
--- a/html/script.js
+++ b/html/script.js
@@ -217,7 +217,7 @@ function setupPlane(hex, plane) {
 
 		if(!mapIsVisible) {
 			selectPlaneByHex(h, true);
-			showMap();
+			//showMap();
 		} else {
 			selectPlaneByHex(h, false);
 		}
@@ -226,7 +226,7 @@ function setupPlane(hex, plane) {
 	}.bind(undefined, hex);
 
 	plane.dblclickListener = function(h, evt) {
-		if (!$("#map_container").is(":visible")) {
+		if(!mapIsVisible) {
 			showMap();
 		}
 		selectPlaneByHex(h, true);
@@ -2097,10 +2097,11 @@ function expandSidebar(e) {
 	setColumnVisibility();
 	refreshTableInfo();
 	updateMapSize();
+	setSelectedInfoBlockVisibility();
 }
 
 function showMap() {
-	$('#sidebar_container').width(localStorage['sidebar_width']);
+	$('#sidebar_container').width(localStorage['sidebar_width']).css('margin-left', '0');
 	$("#map_container").show()
 	mapIsVisible = true;
 	$("#toggle_sidebar_control").show();
@@ -2109,7 +2110,7 @@ function showMap() {
 	$("#show_map_button").hide();
 	setColumnVisibility();
 	refreshTableInfo();
-	updateMapSize();    
+	updateMapSize();
 }
 
 function showColumn(table, columnId, visible) {
@@ -2135,12 +2136,16 @@ function setColumnVisibility() {
 
 function setSelectedInfoBlockVisibility() {
 
-	if (SelectedPlane && mapIsVisible) {
+	if (SelectedPlane) {
 		$('#selected_infoblock').show();
+		if (!mapIsVisible)
+			$("#sidebar_container").css('margin-left', '140pt');
 		//$('#sidebar_canvas').css('margin-bottom', $('#selected_infoblock').height() + 'px');
 	}
 	else {
 		$('#selected_infoblock').hide();
+		if (!mapIsVisible)
+			$("#sidebar_container").css('margin-left', '0');
 		//$('#sidebar_canvas').css('margin-bottom', 0);
 	}
 }