diff --git a/binaries/data/mods/official/gui/test/functions_session.js b/binaries/data/mods/official/gui/test/functions_session.js
index 3aa2d0982a..53e62fb5b1 100755
--- a/binaries/data/mods/official/gui/test/functions_session.js
+++ b/binaries/data/mods/official/gui/test/functions_session.js
@@ -139,8 +139,6 @@ function setPortrait(objectName, portraitString, portraitSuffix, portraitCell)
                 setPortraitGUIObject.cell_id = portraitCell;
 	else
 		setPortraitGUIObject.cell_id = "";
-
-console.write(objectName + " : " + setPortraitGUIObject.sprite + " : " + setPortraitGUIObject.cell_id);
 }
 
 // ====================================================================
diff --git a/binaries/data/mods/official/gui/test/functions_session_status_orb.js b/binaries/data/mods/official/gui/test/functions_session_status_orb.js
index eb4c09f2fd..1a6ae70101 100755
--- a/binaries/data/mods/official/gui/test/functions_session_status_orb.js
+++ b/binaries/data/mods/official/gui/test/functions_session_status_orb.js
@@ -614,18 +614,18 @@ function UpdateList(listIcon, listCol)
 			listArray = parseDelimiterString(listName, ";", listName.length);
 
 			// Populate appropriate command buttons.
-			for (createLoop = 1; createLoop <= command_sub_max; createLoop++)
+			for (createLoop = 0; createLoop < command_sub_max; createLoop++)
 			{
-				if (createLoop < listArray.length+1)
+				if (createLoop < listArray.length)
 				{
 					// Get name of entity to display in list.
-					UpdateListEntityName = selection[0].traits.id.civ_code + "_" + listArray[createLoop-1];
+					UpdateListEntityName = selection[0].traits.id.civ_code + "_" + listArray[createLoop];
 
-					setPortrait("session_panel_status_command_pri_" + listCol + "_" + createLoop, getEntityTemplate(UpdateListEntityName).traits.id.icon, selection[0].traits.id.civ_code, getEntityTemplate(UpdateListEntityName).traits.id.icon_cell);
-					GUIObjectUnhide("session_panel_status_command_pri_" + listCol + "_" + createLoop);
+					setPortrait("session_panel_status_command_pri_" + listCol + "_" + parseInt(createLoop+1), getEntityTemplate(UpdateListEntityName).traits.id.icon, selection[0].traits.id.civ_code, getEntityTemplate(UpdateListEntityName).traits.id.icon_cell);
+					GUIObjectUnhide("session_panel_status_command_pri_" + listCol + "_" + parseInt(createLoop+1));
 				}
 				else
-					GUIObjectHide("session_panel_status_command_pri_" + listCol + "_" + createLoop);
+					GUIObjectHide("session_panel_status_command_pri_" + listCol + "_" + parseInt(createLoop+1));
 			}
 
 			return listArray;
diff --git a/binaries/data/mods/official/gui/test/styles.xml b/binaries/data/mods/official/gui/test/styles.xml
index 9598d047fd..3700a230a4 100755
--- a/binaries/data/mods/official/gui/test/styles.xml
+++ b/binaries/data/mods/official/gui/test/styles.xml
@@ -37,7 +37,6 @@
 		sprite="ui_portrait_default_square"
 		sprite_over="ui_portrait_default_square_lit"
 		sprite_disabled="ui_portrait_default_square_grey"
-		tooltip_style="session_tooltip"
 		text_align="right"
 		textcolor="255 255 255"
 	/>
@@ -46,7 +45,6 @@
 		sprite="ui_portrait_default_circle"
 		sprite_over="ui_portrait_default_circle_lit"
 		sprite_disabled="ui_portrait_default_circle_grey"
-		tooltip_style="session_tooltip"
 		text_align="right"
 		textcolor="255 255 255"
 	/>
@@ -55,28 +53,24 @@
 	<style name="group_portrait_bar"
 		sprite_background=""
 		sprite_bar="green_bar"
-		tooltip_style="session_tooltip"
 		ghost="true"
 	/>
 
 	<style name="up_bar"
 		sprite_background=""
 		sprite_bar="yellow_bar"
-		tooltip_style="session_tooltip"
 		ghost="true"
 	/>
 
 	<style name="blue_bar"
 		sprite_background=""
 		sprite_bar="blue_bar"
-		tooltip_style="session_tooltip"
 		ghost="true"
 	/>
 
 	<style name="blue_bar_outlined"
 		sprite_background="only_black_border"
 		sprite_bar="blue_bar_outlined"
-		tooltip_style="session_tooltip"
 		ghost="true"
 	/>