diff --git a/source/world.adb b/source/world.adb
index 50a0d7e..1f9b31d 100644
--- a/source/world.adb
+++ b/source/world.adb
@@ -1048,6 +1048,8 @@ package body world is
 		offset : constant integer := 8;
 		width  : constant integer := 640;
 		height : constant integer := 600;
+		more   : constant natural := 10;
+		less   : constant natural := 5;
 		at_x   :          integer := core.center_x (width)  + offset;
 		at_y   :          integer := core.center_y (height) + offset;
 	begin
@@ -1055,7 +1057,23 @@ package body world is
 		--
 		ui.draw_sprite (unit.view (show_unit_data), data.name.all, at_x, at_y, 0);
 		--
-		at_y := at_y + unit.view_height;
+		at_x := at_x + unit.view_width;
+		--
+		ui.draw_text_box (at_x, at_y, width - unit.view_width - 2 * offset, core.icon);
+		ui.write         (data.name.all, at_x + less, at_y + less);
+		--
+		at_y := at_y + core.icon;
+		--
+		for index in attribute.enumeration loop
+			ui.draw_icon_menu (at_x, at_y, core.icon * 2, core.icon, attribute.description (index).text.all);
+			core.draw         (attribute.icon (index), at_x, at_y, factor => 1);
+			ui.write          (data.attributes (index)'image, at_x + core.icon + more, at_y + more, code => true);
+			--
+			at_x := at_x + 2 * core.icon;
+		end loop;
+		--
+		at_x := core.center_x (width)  + offset;
+		at_y := core.center_y (height) + offset + unit.view_height;
 		--
 		ui.draw_separator (at_x, at_y, width - 2 * offset);
 		--
@@ -1064,11 +1082,11 @@ package body world is
 		ui.draw_text ("Hiring fee:" & data.hiring_fee'image & character'val (10) &
 		              "Weekly fee:" & data.weekly_fee'image & character'val (10) &
 		              "Battle fee:" & data.battle_fee'image,
-		              at_x, at_y, (width - 3 * offset) / 2 - 20, 0, 0, 10);
+		              at_x, at_y, (width - 3 * offset) / 2 - 2 * more, 0, 0, more);
 		ui.draw_text ("Faction: " & faction.description (data.kind).name.all & character'val (10) &
 		              "Stack:" & data.limit'image & character'val (10) &
 		              "Bonus: " & attribute.description (faction.description (data.kind).bonus_attribute).name.all,
-		              at_x + (width - offset) / 2, at_y, (width - 3 * offset) / 2 - 20, 0, 0, 10);
+		              at_x + (width - offset) / 2, at_y, (width - 3 * offset) / 2 - 2 * more, 0, 0, more);
 	end show_unit;
 
                                              ------------------------------------------------------------------------------------------