diff --git a/src/gui/qt/mainwindow.ui b/src/gui/qt/mainwindow.ui
index 0891e3cf..6f13fcd0 100644
--- a/src/gui/qt/mainwindow.ui
+++ b/src/gui/qt/mainwindow.ui
@@ -1520,7 +1520,7 @@
               <number>0</number>
              </property>
              <property name="spacing" >
-              <number>3</number>
+              <number>5</number>
              </property>
              <item>
               <layout class="QHBoxLayout" >
diff --git a/src/gui/qt/mainwindow/mainwindowimpl.cpp b/src/gui/qt/mainwindow/mainwindowimpl.cpp
index dfdc1ce9..75d0a86a 100755
--- a/src/gui/qt/mainwindow/mainwindowimpl.cpp
+++ b/src/gui/qt/mainwindow/mainwindowimpl.cpp
@@ -464,6 +464,11 @@ mainWindowImpl::mainWindowImpl(QMainWindow *parent)
 	for (i=0; i<MAX_NUMBER_OF_PLAYERS; i++) { actionLabelArray[i]->raise(); }
 
 
+	//resize stop-button depending on translation
+	QFontMetrics tempMetrics = this->fontMetrics();
+	int width = tempMetrics.width(tr("Stop"));
+	pushButton_break->setMinimumSize(width+10,20);
+
 	//ShortCuts 
 // 	QShortcut *startNewGameKeys = new QShortcut(QKeySequence(Qt::Key_Control + Qt::Key_N), this);
 // 	connect( startNewGameKeys, SIGNAL(activated() ), actionNewGame, SLOT( trigger() ) );
@@ -633,10 +638,14 @@ void mainWindowImpl::callCreateNetworkGameDialog() {
 		gameData.handsBeforeRaise = myCreateNetworkGameDialog->spinBox_handsBeforeRaiseSmallBlind->value();
 		gameData.guiSpeed = myCreateNetworkGameDialog->spinBox_gameSpeed->value();
 
+		myStartNetworkGameDialog->treeWidget->clear();
+	
 		mySession->startNetworkServer(gameData);
 		mySession->startNetworkClientForLocalServer();
 
 		myStartNetworkGameDialog->exec();
+		
+
 
 		if (myStartNetworkGameDialog->result() == QDialog::Accepted ) {
 			mySession->initiateNetworkServerGame();
@@ -1998,6 +2007,11 @@ void mainWindowImpl::startNewHand() {
 	}
 	else { 
 		pushButton_break->setDisabled(FALSE);
+		
+		QFontMetrics tempMetrics = this->fontMetrics();
+		int width = tempMetrics.width(tr("Start"));
+		pushButton_break->setMinimumSize(width+10,20);
+
 		pushButton_break->setText(tr("Start"));
 		breakAfterActualHand=FALSE;
 
@@ -2121,8 +2135,10 @@ void mainWindowImpl::breakButtonClicked() {
 		tempPalette.setColor(QPalette::ButtonText, QColor(240,240,240));
 		pushButton_break->setPalette(tempPalette);
 
-// 		QFontMetrics tempMetrics = this->fontMetrics();
-// 		int width = tempMetrics()
+		QFontMetrics tempMetrics = this->fontMetrics();
+		int width = tempMetrics.width(tr("Stop"));
+		pushButton_break->setMinimumSize(width+10,20);
+
              	pushButton_break->setText(tr("Stop"));
 		startNewHand();
 	}