diff --git a/ErgometerIPR/ErgometerApplication/ClientApplicatie.Designer.cs b/ErgometerIPR/ErgometerApplication/ClientApplicatie.Designer.cs
index 663b682..c668ab9 100644
--- a/ErgometerIPR/ErgometerApplication/ClientApplicatie.Designer.cs
+++ b/ErgometerIPR/ErgometerApplication/ClientApplicatie.Designer.cs
@@ -46,13 +46,10 @@ namespace ErgometerApplication
             this.labelHallo = new System.Windows.Forms.Label();
 
             this.heartBeat = new PanelClientData("Hartslag", 50, 220);
-            this.RPM = new PanelClientData("RPM", 0, 120);
-            this.speed = new PanelClientData("Snelheid", 0, 50);
-            this.distance = new PanelClientData("Afstand (km)", 0, 100);
+            this.RPM = new PanelClientData("RPM", 30, 70);
             this.power = new PanelClientData("Weerstand", 25, 400);
-            this.energy = new PanelClientData("Energie", 0, 200);
-            this.actualpower = new PanelClientData("Absolute Weerstand", 0, 400);
-            this.time = new PanelClientData("Tijd", 0, 400);
+            this.actualpower = new PanelClientData("Huidige Weerstand", 0, 400);
+            this.time = new PanelClientData("Tijd", 0, 0);
             this.steps = new PanelClientSteps();
 
             this.panelClientContainer.SuspendLayout();
@@ -88,13 +85,11 @@ namespace ErgometerApplication
             this.panelDataViewLeft.Size = new System.Drawing.Size(18, 600);
             this.panelDataViewLeft.TabIndex = 3;
             this.panelDataViewLeft.BackColor = System.Drawing.Color.Gray;
-            this.panelDataViewLeft.Controls.Add(heartBeat);
-            this.panelDataViewLeft.Controls.Add(RPM);
-            this.panelDataViewLeft.Controls.Add(speed);
-            this.panelDataViewLeft.Controls.Add(distance);
+            
             this.panelDataViewLeft.Controls.Add(power);
-            this.panelDataViewLeft.Controls.Add(energy);
             this.panelDataViewLeft.Controls.Add(actualpower);
+            this.panelDataViewLeft.Controls.Add(RPM);
+            this.panelDataViewLeft.Controls.Add(heartBeat);
             this.panelDataViewLeft.Controls.Add(steps);
             this.panelDataViewLeft.Controls.Add(time);
 
@@ -189,7 +184,7 @@ namespace ErgometerApplication
         private System.Windows.Forms.Button buttonLogOff;
         private System.Windows.Forms.Label labelUsername;
         private System.Windows.Forms.Label labelHallo;
-        public PanelClientData heartBeat, RPM, speed, distance, power, energy, seconds, actualpower, time;
+        public PanelClientData heartBeat, RPM, power, seconds, actualpower, time;
         public PanelClientSteps steps;
     }
 
diff --git a/ErgometerIPR/ErgometerApplication/ClientApplicatie.cs b/ErgometerIPR/ErgometerApplication/ClientApplicatie.cs
index cfc33ae..81e173b 100644
--- a/ErgometerIPR/ErgometerApplication/ClientApplicatie.cs
+++ b/ErgometerIPR/ErgometerApplication/ClientApplicatie.cs
@@ -45,10 +45,7 @@ namespace ErgometerApplication
 
                     heartBeat.updateValue(m.HeartBeat);
                     RPM.updateValue(m.RPM);
-                    speed.updateValue(m.Speed);
-                    distance.updateValue(m.Distance);
                     power.updateValue(m.Power);
-                    energy.updateValue(m.Energy);
                     actualpower.updateValue(m.ActualPower);
                     time.updateValue(m.Seconds);
 
@@ -74,19 +71,28 @@ namespace ErgometerApplication
                 }
                 if (password.Length > 0)
                 {
-                    string error = "";
-                    bool connect = MainClient.Connect(SerialPort.GetPortNames()[0], username, password, out error);
-
-                    if (connect)
+                    if (SerialPort.GetPortNames().Length > 0)
                     {
-                        panelGatherInfo.BringToFront();
-                        panelTopBar.Visible = true;
-                        this.labelUsername.Text = panelLogin.textBoxUsername.Text;
-                        
+                        string error = "";
+                        bool connect = MainClient.Connect(SerialPort.GetPortNames()[0], username, password, out error);
+
+                        if (connect)
+                        {
+                            panelGatherInfo.BringToFront();
+                            panelTopBar.Visible = true;
+                            this.labelUsername.Text = panelLogin.textBoxUsername.Text;
+
+                        }
+                        else
+                        {
+                            panelLogin.lblVerification.Text = error;
+                            panelLogin.lblVerification.ForeColor = Color.Red;
+                            panelLogin.lblVerification.Visible = true;
+                        }
                     }
                     else
                     {
-                        panelLogin.lblVerification.Text = error;
+                        panelLogin.lblVerification.Text = "De Ergometer is niet verbonden.";
                         panelLogin.lblVerification.ForeColor = Color.Red;
                         panelLogin.lblVerification.Visible = true;
                     }