diff --git a/Laptop/DropDown.cpp b/Laptop/DropDown.cpp
index fb628db5..c7cb6c12 100644
--- a/Laptop/DropDown.cpp
+++ b/Laptop/DropDown.cpp
@@ -119,10 +119,7 @@ void * gDropObj;
 void
 DropDownBase::Create(UINT16 sX, UINT16 sY)
 {
-	if( mfMouseRegionsCreated )
-	{
-		return Destroy();
-	}
+	Destroy();
 
 	Init(sX, sY);
 
@@ -156,10 +153,7 @@ DropDownBase::Create(UINT16 sX, UINT16 sY)
 void
 DropDownBase::Create_Drop()
 {
-	if( mfMouseRegionsCreated_Drop )
-	{
-		return Destroy_Drop();
-	}
+	Destroy_Drop();
 
 	Init_Drop();
 
diff --git a/Laptop/IMP Disability Trait.cpp b/Laptop/IMP Disability Trait.cpp
index 42c13972..694fac9b 100644
--- a/Laptop/IMP Disability Trait.cpp	
+++ b/Laptop/IMP Disability Trait.cpp	
@@ -414,7 +414,7 @@ void BtnIMPDisabilityTraitFinishCallback(GUI_BUTTON *btn,INT32 reason)
 
 	if (!(btn->uiFlags & BUTTON_ENABLED))
 		return;
-
+		
 	if( reason & MSYS_CALLBACK_REASON_LBUTTON_DWN )
 	{
 		btn->uiFlags|=(BUTTON_CLICKED_ON);
@@ -427,7 +427,7 @@ void BtnIMPDisabilityTraitFinishCallback(GUI_BUTTON *btn,INT32 reason)
 		}
 		else
 		{
-			iCurrentImpPage = IMP_MAIN_PAGE;
+			iCurrentImpPage = IMP_PREJUDICE;
 
 			if( CameBackToDisabilityTraitPageButNotFinished() )
 			{
diff --git a/Laptop/IMP Minor Trait.cpp b/Laptop/IMP Minor Trait.cpp
index a0525ff5..e2c0e330 100644
--- a/Laptop/IMP Minor Trait.cpp	
+++ b/Laptop/IMP Minor Trait.cpp	
@@ -501,19 +501,24 @@ void BtnIMPMinorTraitFinishCallback(GUI_BUTTON *btn,INT32 reason)
 			//go back tot he done screen
 			iCurrentImpPage = IMP_FINISH;
 		}
+		// Flugente: setting determines wether we see the background page
+		else if ( gGameOptions.fBackGround )
+		{
+			iCurrentImpPage = IMP_BACKGROUND;
+
+			fButtonPendingFlag = TRUE;
+		}
 		else
 		{
-			iCurrentImpPage = IMP_PREJUDICE;
+			iCurrentImpPage = IMP_MAIN_PAGE;
 
 			if( CameBackToMinorTraitPageButNotFinished() )
 			{
 			}
 			else
 			{
-				if ( iCurrentProfileMode != IMP__FINISH )
-					iCurrentProfileMode = IMP__PERSONALITY;
-				else
-					iCurrentProfileMode = IMP__FINISH;
+				//We are finished on this page
+				iCurrentProfileMode = IMP__ATTRIBUTES;
 			}
 		}
 	}
diff --git a/Laptop/IMP Prejudice.cpp b/Laptop/IMP Prejudice.cpp
index 1a1e661f..8d9b11de 100644
--- a/Laptop/IMP Prejudice.cpp	
+++ b/Laptop/IMP Prejudice.cpp	
@@ -361,7 +361,7 @@ void BtnIMPPrejudiceFinishCallback(GUI_BUTTON *btn,INT32 reason)
 	// btn callback for IMP personality quiz answer button
 	if (!(btn->uiFlags & BUTTON_ENABLED))
 		return;
-
+		
 	if( reason & MSYS_CALLBACK_REASON_LBUTTON_DWN )
 	{
 		btn->uiFlags|=(BUTTON_CLICKED_ON);
@@ -387,24 +387,17 @@ void BtnIMPPrejudiceFinishCallback(GUI_BUTTON *btn,INT32 reason)
 			bRacist						= ( INT8)DropDownTemplate<DROPDOWNNR_RACIST>::getInstance().GetSelectedEntryKey();
 			bSexist						= (UINT8)DropDownTemplate<DROPDOWNNR_SEXIST>::getInstance().GetSelectedEntryKey();
 
-			if ( gGameOptions.fBackGround )
-			{
-				iCurrentImpPage = IMP_BACKGROUND;
+			iCurrentImpPage = IMP_MAIN_PAGE;
 
-				fButtonPendingFlag = TRUE;
+			if( CameBackToPrejudicePageButNotFinished() )
+			{
 			}
 			else
 			{
-				iCurrentImpPage = IMP_MAIN_PAGE;
-
-				if( CameBackToPrejudicePageButNotFinished() )
-				{
-				}
+				if ( iCurrentProfileMode != IMP__FINISH )
+					iCurrentProfileMode = IMP__PERSONALITY;
 				else
-				{
-					//We are finished on this page
-					iCurrentProfileMode = IMP__ATTRIBUTES;
-				}
+					iCurrentProfileMode = IMP__FINISH;
 			}
 		}
 	}