4 files changed, 12 insertions, 14 deletions
diff --git a/src/server/connectionframe/connectionframe.cpp b/src/server/connectionframe/connectionframe.cpp
index 4b3a7dd..75d24a4 100644
--- a/src/server/connectionframe/connectionframe.cpp
+++ b/src/server/connectionframe/connectionframe.cpp
@@ -21,20 +21,20 @@
 #include <cassert>
 
 static QString style_student(
-	"QLabel{ background-color: #919191; border-radius: 2px; color: black;} \
-	QGroupBox { background-color: #919191; margin: 2px; border-radius: 4px}"
+	"QLabel{ background-color: #FFF; border-radius: 2px; color: black;} \
+	QGroupBox { background-color: #AAA; margin: 2px; border-radius: 4px}"
 );
 static QString style_tutor(
-	"QLabel{ background-color: #70C670; border-radius: 2px; color: black;} \
+	"QLabel{ background-color: #FFF; border-radius: 2px; color: black;} \
 	QGroupBox { background-color: #70C670; margin: 2px; border-radius: 4px}"
 );
 static QString style_selectedStudent(
-		"QLabel{ background-color: #6C8CD5; border-radius: 2px; color: black; } \
-		QGroupBox { background-color: #919191; margin: 0px; border-radius: 4px; border: 2px dashed #6C8CD5;}"
+		"QLabel{ background-color: #FFF; border-radius: 2px; color: black; } \
+		QGroupBox { background-color: #AAA; margin: 0px; border-radius: 4px; border: 2px solid #6C8CD5;}"
 );
 static QString style_selectedTutor(
-		"QLabel{ background-color: #6C8CD5; border-radius: 2px; color: black;} \
-		QGroupBox { background-color: #70C670; margin: 0px;  border-radius: 4px; border: 2px dashed #6C8CD5;}"
+		"QLabel{ background-color: #FFF; border-radius: 2px; color: black;} \
+		QGroupBox { background-color: #70C670; margin: 0px;  border-radius: 4px; border: 2px solid #6C8CD5;}"
 );
 static QString style_disconnected(
 		"QLabel{ background-color: #919191; color: black; } \
diff --git a/src/server/mainwindow/mainwindow.cpp b/src/server/mainwindow/mainwindow.cpp
index 3d0d167..1844458 100644
--- a/src/server/mainwindow/mainwindow.cpp
+++ b/src/server/mainwindow/mainwindow.cpp
@@ -683,7 +683,7 @@ void MainWindow::onButtonTutorToStudent()
 			continue;
 		if ((**it).selected())
 			to = c;
-		else if ((**it).isTutor())
+		if ((**it).isTutor())
 			from = c;
 	}
 	if (to == NULL)
diff --git a/src/server/mainwindow/mainwindow.h b/src/server/mainwindow/mainwindow.h
index 153eb5b..c06f8e9 100644
--- a/src/server/mainwindow/mainwindow.h
+++ b/src/server/mainwindow/mainwindow.h
@@ -11,8 +11,7 @@ class ConnectionFrame;
 class ListenServer;
 class DiscoveryListener;
 
-namespace Ui
-{
+namespace Ui{
 	class MainWindow;
 }
 
@@ -43,7 +42,7 @@ private:
 	// Button block stuff
 	QTimer * _buttonLockTimer;
 	QList<QAction*> _lockingButtons;
-	static const qint64 _buttonBlockTime = 1000;
+	static const qint64 _buttonBlockTime = 600;
 
     /**
      * Downloader for IP - List of possible tutors.
diff --git a/src/server/sessionnamewindow/sessionnamewindow.h b/src/server/sessionnamewindow/sessionnamewindow.h
index ed944c1..ee93ea2 100644
--- a/src/server/sessionnamewindow/sessionnamewindow.h
+++ b/src/server/sessionnamewindow/sessionnamewindow.h
@@ -4,8 +4,7 @@
 #include <QtGui>
 
 
-namespace Ui
-{
+namespace Ui{
 class SessionName;
 }
 
@@ -14,7 +13,7 @@ class SessionNameWindow : public QDialog
     Q_OBJECT
 
 private:
-    Ui::SessionName *ui;
+		Ui::SessionName *ui;
 
 public:
     SessionNameWindow(QWidget *parent = 0);