diff --git a/Strategic/Map Screen Interface Border.cpp b/Strategic/Map Screen Interface Border.cpp
index 213559d09..4155783dd 100644
--- a/Strategic/Map Screen Interface Border.cpp	
+++ b/Strategic/Map Screen Interface Border.cpp	
@@ -124,7 +124,7 @@ BOOLEAN LoadMapBorderGraphics( void )
 	{
 		FilenameForBPP( "INTERFACE\\MBS.sti", VObjectDesc.ImageFile );
 	}
-	else if (iResolution == _1280x720)
+	else if (isWidescreenUI())
 	{
 		FilenameForBPP("INTERFACE\\MBS_1280x720.sti", VObjectDesc.ImageFile);
 	}
diff --git a/Strategic/Map Screen Interface Bottom.cpp b/Strategic/Map Screen Interface Bottom.cpp
index cf1ffd2e2..f2c1845fa 100644
--- a/Strategic/Map Screen Interface Bottom.cpp	
+++ b/Strategic/Map Screen Interface Bottom.cpp	
@@ -266,7 +266,7 @@ void HandleLoadOfMapBottomGraphics( void )
 	{
 		FilenameForBPP( "INTERFACE\\map_screen_bottom.sti", VObjectDesc.ImageFile );
 	}
-	else if (iResolution == _1280x720)
+	else if (isWidescreenUI())
 	{
 		FilenameForBPP("INTERFACE\\map_screen_bottom_1280x720.sti", VObjectDesc.ImageFile);
 	}
diff --git a/Strategic/Map Screen Interface Map Inventory.cpp b/Strategic/Map Screen Interface Map Inventory.cpp
index d0350d685..826e4c7be 100644
--- a/Strategic/Map Screen Interface Map Inventory.cpp	
+++ b/Strategic/Map Screen Interface Map Inventory.cpp	
@@ -40,6 +40,7 @@
 #include "Interface Items.h"
 #include "Food.h"	// added by Flugente
 #include "Campaign Types.h"	// added by Flugente
+#include "mapscreen.h"
 
 //forward declarations of common classes to eliminate includes
 class OBJECTTYPE;
@@ -448,7 +449,7 @@ BOOLEAN LoadInventoryPoolGraphic( void )
 	{
 		sprintf( VObjectDesc.ImageFile, "INTERFACE\\sector_inventory.sti" );
 	}
-	else if (iResolution == _1280x720)
+	else if (isWidescreenUI())
 	{
 		sprintf(VObjectDesc.ImageFile, "INTERFACE\\sector_inventory_1280x720.sti");
 	}
diff --git a/Strategic/Map Screen Interface Map.cpp b/Strategic/Map Screen Interface Map.cpp
index ce90cf0df..cfa3d83b9 100644
--- a/Strategic/Map Screen Interface Map.cpp	
+++ b/Strategic/Map Screen Interface Map.cpp	
@@ -1819,7 +1819,7 @@ BOOLEAN InitializePalettesForMap( void )
 
 	if (iResolution >= _640x480 && iResolution < _800x600)
  		strcpy(vs_desc.ImageFile, "INTERFACE\\b_map.pcx");
-	else if (iResolution == _1280x720)
+	else if (isWidescreenUI())
 		strcpy(vs_desc.ImageFile, "INTERFACE\\b_map_1280x720.pcx");
 	else if (iResolution < _1024x768)
 		strcpy(vs_desc.ImageFile, "INTERFACE\\b_map_800x600.pcx");
@@ -6717,7 +6717,7 @@ void HandleLowerLevelMapBlit( void )
 		offsetY = yVal;
 		imageIndex = 0;
 	}
-	else if (iResolution == _1280x720)
+	else if (isWidescreenUI())
 	{
 		offsetX = xVal + 21;
 		offsetY = yVal + 17;
diff --git a/Strategic/mapscreen.cpp b/Strategic/mapscreen.cpp
index dd9a13817..11c395634 100644
--- a/Strategic/mapscreen.cpp
+++ b/Strategic/mapscreen.cpp
@@ -4952,7 +4952,7 @@ UINT32 MapScreenHandle(void)
 			VObjectDesc.fCreateFlags=VOBJECT_CREATE_FROMFILE;
 			if (!is_networked)
 			{
-				if (iResolution == _1280x720)
+				if (isWidescreenUI())
 				{
 					FilenameForBPP("INTERFACE\\newgoldpiece3_1280x720.sti", VObjectDesc.ImageFile);
 				}
@@ -4972,7 +4972,7 @@ UINT32 MapScreenHandle(void)
 			else
 			{
 				// OJW - 20081204 - change mapscreen interface for MP games
-				if (iResolution == _1280x720)
+				if (isWidescreenUI())
 				{
 					FilenameForBPP("INTERFACE\\mpgoldpiece3_1280x720.sti", VObjectDesc.ImageFile);
 				}
@@ -15668,6 +15668,7 @@ void ChangeSelectedInfoChar( INT8 bCharNumber, BOOLEAN fResetSelectedList )
 		}
 
 		fCharacterInfoPanelDirty = TRUE;
+		fResetMapCoords = TRUE;
 
 		// if showing sector inventory
 		if ( fShowMapInventoryPool )
diff --git a/Utils/message.cpp b/Utils/message.cpp
index f77a941be..4c6163c48 100644
--- a/Utils/message.cpp
+++ b/Utils/message.cpp
@@ -10,6 +10,7 @@
 	#include "renderworld.h"
 	#include "local.h"
 	#include "interface.h"
+	#include "mapscreen.h"
 	#include "Map Screen Interface Bottom.h"
 	#include "WordWrap.h"
 	#include "Sound Control.h"
@@ -1036,7 +1037,7 @@ void MapScreenMessage( UINT16 usColor, UINT8 ubPriority, STR16 pStringA, ... )
 	// HEADROCK HAM 3.6: Allow for longer lines.
 	// Lejardo ARSProject
 	MAP_LINE_WIDTH = (INTERFACE_WIDTH - 330);
-	if (iResolution == _1280x720)
+	if (isWidescreenUI())
 	{
 		MAP_LINE_WIDTH = 685;
 	}
@@ -1129,7 +1130,7 @@ void DisplayStringsInMapScreenMessageList( void )
 	UINT16 usSpacing;
 	UINT16 MessageStartX = (SCREEN_WIDTH - INTERFACE_WIDTH) / 2;
 	UINT16 MessageEndX = MessageStartX + (INTERFACE_WIDTH - 330);
-	if (iResolution == _1280x720)
+	if (isWidescreenUI())
 	{
 		MessageStartX = 0;
 		MessageEndX = 705;