diff --git a/ErgometerDoctorApplication/ConActiveSessions.cs b/ErgometerDoctorApplication/ConActiveSessions.cs
index 0263117..e8389cc 100644
--- a/ErgometerDoctorApplication/ConActiveSessions.cs
+++ b/ErgometerDoctorApplication/ConActiveSessions.cs
@@ -16,40 +16,6 @@ namespace ErgometerDoctorApplication
         public ConActiveSessions() : base()
         {
             labelActiveSessions = new Label();
-
-			/*
-            this.data = new DataGridView();
-            this.name = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.sessionId = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            ((System.ComponentModel.ISupportInitialize)(this.data)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // SongsTableView
-            // 
-            this.data.AllowUserToAddRows = false;
-            this.data.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.name, this.sessionId});
-            this.data.AllowUserToDeleteRows = false;
-            this.data.AllowUserToResizeRows = false;
-            this.data.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.data.Location = new System.Drawing.Point(0, 0);
-            this.data.MultiSelect = false;
-            this.data.Name = "Active Sessions";
-            this.data.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
-            this.data.Size = new System.Drawing.Size(760, 172);
-            this.data.TabIndex = 0;
-            this.data.CellContentClick += new DataGridViewCellEventHandler(this.data_CellContentClick);
-            // 
-            // name
-            // 
-            this.name.HeaderText = "Name";
-            this.name.Name = "Name";
-            // 
-            // sessionId
-            // 
-            this.sessionId.HeaderText = "Session ID";
-            this.sessionId.Name = "Session ID";
-			*/
             // 
             // ConActiveSessions
             // 
@@ -61,10 +27,10 @@ namespace ErgometerDoctorApplication
             // 
             // labelActiveSessions
             // 
-            this.labelActiveSessions.Anchor = System.Windows.Forms.AnchorStyles.None;
+            this.labelActiveSessions.Anchor = System.Windows.Forms.AnchorStyles.Top | AnchorStyles.Left;
             this.labelActiveSessions.AutoSize = true;
             this.labelActiveSessions.Font = new System.Drawing.Font("Segoe UI Semibold", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.labelActiveSessions.Location = new System.Drawing.Point(0, 50);
+            this.labelActiveSessions.Location = new System.Drawing.Point(20, 20);
             this.labelActiveSessions.Name = "labelActiveSessions";
             this.labelActiveSessions.Size = new System.Drawing.Size(103, 21);
             this.labelActiveSessions.TabIndex = 3;
diff --git a/ErgometerDoctorApplication/ConClientBroadcast.cs b/ErgometerDoctorApplication/ConClientBroadcast.cs
index 6423c52..6013746 100644
--- a/ErgometerDoctorApplication/ConClientBroadcast.cs
+++ b/ErgometerDoctorApplication/ConClientBroadcast.cs
@@ -25,10 +25,10 @@ namespace ErgometerDoctorApplication
             // 
             // buttonLogin
             // 
-            this.buttonBroadcast.Anchor = System.Windows.Forms.AnchorStyles.None;
+            this.buttonBroadcast.Anchor = AnchorStyles.Left | AnchorStyles.Top;
             this.buttonBroadcast.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.buttonBroadcast.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.buttonBroadcast.Location = new System.Drawing.Point(0, 180);
+            this.buttonBroadcast.Location = new System.Drawing.Point(200, 20);
             this.buttonBroadcast.Name = "buttonCreate";
             this.buttonBroadcast.Size = new System.Drawing.Size(168, 31);
             this.buttonBroadcast.TabIndex = 3;
@@ -38,8 +38,8 @@ namespace ErgometerDoctorApplication
             // 
             // textBoxPassword
             // 
-            this.textBoxBroadcast.Anchor = System.Windows.Forms.AnchorStyles.None;
-            this.textBoxBroadcast.Location = new System.Drawing.Point(0, 80);
+            this.textBoxBroadcast.Anchor = AnchorStyles.Left | AnchorStyles.Top;
+            this.textBoxBroadcast.Location = new System.Drawing.Point(20, 20);
             this.textBoxBroadcast.MaxLength = 16;
             this.textBoxBroadcast.Name = "textBoxPassword";
             this.textBoxBroadcast.Size = new System.Drawing.Size(167, 20);
diff --git a/ErgometerDoctorApplication/ConSessionHistory.cs b/ErgometerDoctorApplication/ConSessionHistory.cs
index 15b925f..1326d43 100644
--- a/ErgometerDoctorApplication/ConSessionHistory.cs
+++ b/ErgometerDoctorApplication/ConSessionHistory.cs
@@ -23,10 +23,10 @@ namespace ErgometerDoctorApplication
             // 
             // labelSessionHistory
             // 
-            this.labelSessionHistory.Anchor = System.Windows.Forms.AnchorStyles.None;
+            this.labelSessionHistory.Anchor = System.Windows.Forms.AnchorStyles.Top | AnchorStyles.Left;
             this.labelSessionHistory.AutoSize = true;
             this.labelSessionHistory.Font = new System.Drawing.Font("Segoe UI Semibold", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.labelSessionHistory.Location = new System.Drawing.Point(0, 50);
+            this.labelSessionHistory.Location = new System.Drawing.Point(20, 20);
             this.labelSessionHistory.Name = "labelSessionHistory";
             this.labelSessionHistory.Size = new System.Drawing.Size(103, 21);
             this.labelSessionHistory.TabIndex = 3;