diff --git a/source/glest_game/graphics/renderer.cpp b/source/glest_game/graphics/renderer.cpp
index 04a4537d..d5400dbc 100644
--- a/source/glest_game/graphics/renderer.cpp
+++ b/source/glest_game/graphics/renderer.cpp
@@ -5345,13 +5345,13 @@ void Renderer::renderMapPreview( const MapPreview *map, bool renderAll,
 
 	assertGl();
 
+	glLineWidth(1);
+
 	glPopMatrix();
 	glPopAttrib();
 	glMatrixMode(GL_PROJECTION);
 	glPopMatrix();
 
-	assertGl();
-
 	if(supportFBOs == true && renderToTexture != NULL) {
 		Texture2DGl *texture = static_cast<Texture2DGl *>(*renderToTexture);
 		if(texture != NULL) {
diff --git a/source/glest_game/menu/menu_state_custom_game.cpp b/source/glest_game/menu/menu_state_custom_game.cpp
index 39daa4dd..7a0a2f00 100644
--- a/source/glest_game/menu/menu_state_custom_game.cpp
+++ b/source/glest_game/menu/menu_state_custom_game.cpp
@@ -1308,11 +1308,10 @@ void MenuStateCustomGame::render() {
 			//printf("=================> Rendering map preview texture\n");
 		}
 
-		if(mainMessageBox.getEnabled()){
+		if(mainMessageBox.getEnabled()) {
 			renderer.renderMessageBox(&mainMessageBox);
 		}
-		else
-		{
+		else {
 			renderer.renderButton(&buttonReturn);
 			renderer.renderButton(&buttonPlayNow);
 			renderer.renderButton(&buttonRestoreLastSettings);
@@ -1448,11 +1447,11 @@ void MenuStateCustomGame::render() {
 		if( enableMapPreview == true &&
 			mapPreview.hasFileLoaded() == true) {
 
-			int mouseX = mainMenu->getMouseX();
-			int mouseY = mainMenu->getMouseY();
-			int mouse2dAnim = mainMenu->getMouse2dAnim();
+			//int mouseX = mainMenu->getMouseX();
+			//int mouseY = mainMenu->getMouseY();
+			//int mouse2dAnim = mainMenu->getMouse2dAnim();
 
-		    renderer.renderMouse2d(mouseX, mouseY, mouse2dAnim);
+		    //renderer.renderMouse2d(mouseX, mouseY, mouse2dAnim);
 
 		    if(mapPreviewTexture == NULL) {
 		    	bool renderAll = (listBoxFogOfWar.getSelectedItemIndex() == 2);
diff --git a/source/glest_game/menu/menu_state_root.cpp b/source/glest_game/menu/menu_state_root.cpp
index 0af3d383..cf691f81 100644
--- a/source/glest_game/menu/menu_state_root.cpp
+++ b/source/glest_game/menu/menu_state_root.cpp
@@ -86,19 +86,19 @@ void MenuStateRoot::mouseClick(int x, int y, MouseButton mouseButton){
 	CoreData &coreData=  CoreData::getInstance();
 	SoundRenderer &soundRenderer= SoundRenderer::getInstance();
 
-	if(buttonNewGame.mouseClick(x, y)){
+	if(mainMessageBox.getEnabled() == false && buttonNewGame.mouseClick(x, y)){
 		soundRenderer.playFx(coreData.getClickSoundB());
 		mainMenu->setState(new MenuStateNewGame(program, mainMenu));
     }
-	else if(buttonMods.mouseClick(x, y)){
+	else if(mainMessageBox.getEnabled() == false && buttonMods.mouseClick(x, y)){
 		soundRenderer.playFx(coreData.getClickSoundB());
 		mainMenu->setState(new MenuStateMods(program, mainMenu));
     }
-    else if(buttonOptions.mouseClick(x, y)){
+    else if(mainMessageBox.getEnabled() == false && buttonOptions.mouseClick(x, y)){
 		soundRenderer.playFx(coreData.getClickSoundB());
 		mainMenu->setState(new MenuStateOptions(program, mainMenu));
     }
-    else if(buttonAbout.mouseClick(x, y)){
+    else if(mainMessageBox.getEnabled() == false && buttonAbout.mouseClick(x, y)){
 		soundRenderer.playFx(coreData.getClickSoundB());
 		mainMenu->setState(new MenuStateAbout(program, mainMenu));
     }
@@ -197,7 +197,7 @@ void MenuStateRoot::render() {
 	renderer.renderConsole(&console,false,true);
 
 	//exit message box
-	if(mainMessageBox.getEnabled()){
+	if(mainMessageBox.getEnabled()) {
 		renderer.renderMessageBox(&mainMessageBox);
 	}
 	if(program != NULL) program->renderProgramMsgBox();
diff --git a/source/shared_lib/include/graphics/gl/texture_gl.h b/source/shared_lib/include/graphics/gl/texture_gl.h
index 92aa8d3b..1578be71 100644
--- a/source/shared_lib/include/graphics/gl/texture_gl.h
+++ b/source/shared_lib/include/graphics/gl/texture_gl.h
@@ -44,6 +44,7 @@ public:
 	void setup_FBO_RBO();
 	void attachFrameBufferToTexture();
 	void dettachFrameBufferFromTexture();
+	void dettachRenderBufferFromTexture();
 	bool checkFrameBufferStatus();
 	void teardown_FBO_RBO();
 
diff --git a/source/shared_lib/sources/graphics/gl/texture_gl.cpp b/source/shared_lib/sources/graphics/gl/texture_gl.cpp
index 18d6390e..1f0db1b1 100644
--- a/source/shared_lib/sources/graphics/gl/texture_gl.cpp
+++ b/source/shared_lib/sources/graphics/gl/texture_gl.cpp
@@ -633,6 +633,13 @@ void TextureGl::dettachFrameBufferFromTexture() {
 	}
 }
 
+void TextureGl::dettachRenderBufferFromTexture() {
+	// Need some work to get extensions properly working in Windows (use Glew lib)
+	if(glGenFramebuffersEXT) {
+		glBindRenderbufferEXT(GL_RENDERBUFFER_EXT, 0);
+	}
+}
+
 TextureGl::~TextureGl() {
 	// Need some work to get extensions properly working in Windows (use Glew lib)
 	if(glGenFramebuffersEXT) {