diff --git a/source/main.adb b/source/main.adb
index dfffb3b..9ba343f 100644
--- a/source/main.adb
+++ b/source/main.adb
@@ -182,7 +182,7 @@ begin
 	introduction_loop: loop
 		synchronize;
 		--
-		exit when signal_mode = signal_space;
+		exit when signal_mode = signal_space or cursor_mode = 2;
 		--
 		case signal_mode is
 			when signal_none  => null;
@@ -197,14 +197,18 @@ begin
 		ui.write ("[-- Please press Spacebar to continue]", 0, center_y (24), (102, 102, 102, 255));
 	end loop introduction_loop;
 
+	cursor_mode := 0;
+
 	main_menu_loop: loop
 		synchronize;
 		--
-		exit when signal_mode = signal_space;
+		exit when signal_mode = signal_space or cursor_mode = 2;
 		--
 		main_menu;
 	end loop main_menu_loop;
 
+	cursor_mode := 0;
+
 	ui.active := ui.style'val (faction.enumeration'pos (chad.trait (player.index).kind) + 1);
 
 	gameplay_loop: loop
@@ -245,7 +249,7 @@ begin
 			              view_show (index));
 		end loop;
 		--
-		resource.draw_points (player.resources, (preview_width - 4 * icon * resource.count) / 2, icon);
+		resource.draw_points (player.resources, (preview_width - 4 * icon * resource.count) / 2, (if view_list (map_preview_panel) then icon else 0));
 		--
 		signal_list (signal_mode).all;
 		--
diff --git a/source/ui.adb b/source/ui.adb
index 5002fd3..96b54ab 100644
--- a/source/ui.adb
+++ b/source/ui.adb
@@ -220,8 +220,6 @@ package body ui is
 	begin
 		prioritize := false;
 		--
-		write_text_box ("--");
-		--
 		for index in 0 .. structure_count - 1 loop
 			if signal_mode = structure_array (index).toggle then
 				structure_array (index).show := not structure_array (index).show;
@@ -319,6 +317,8 @@ package body ui is
 		draw (text_lower_right, x + width - offset, y + height - offset);
 		--
 		write (core.read_text_box, (core.icon - font (active).scale) / 2 + x + 4, (core.icon - font (active).scale) / 2 + y);
+		--
+		core.write_text_box ("--");
 	end draw_help_box;
 
                                              ------------------------------------------------------------------------------------------
@@ -367,8 +367,6 @@ package body ui is
 		       (if core.cursor_inside (x, y, width, height) then font_tint (active) else (others => 255)));
 		--
 		if core.cursor_inside (x, y, width, height) then
-			core.write_text_box (description);
-			--
 			if core.cursor_mode = 1 then
 				action.all;
 				core.cursor_mode := 0;