diff --git a/WebClient/WpfWebClient/Connected Services/ServiceReferenceEHEC/Reference.cs b/WebClient/WpfWebClient/Connected Services/ServiceReferenceEHEC/Reference.cs
index 35cc055..30e7156 100644
--- a/WebClient/WpfWebClient/Connected Services/ServiceReferenceEHEC/Reference.cs	
+++ b/WebClient/WpfWebClient/Connected Services/ServiceReferenceEHEC/Reference.cs	
@@ -36,7 +36,7 @@ namespace WpfWebClient.ServiceReferenceEHEC {
         private string LastNameField;
         
         [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private int PersonIdField;
+        private int PersonIDField;
         
         [System.Runtime.Serialization.OptionalFieldAttribute()]
         private WpfWebClient.ServiceReferenceEHEC.Salutation SalutationField;
@@ -107,14 +107,14 @@ namespace WpfWebClient.ServiceReferenceEHEC {
         }
         
         [System.Runtime.Serialization.DataMemberAttribute()]
-        public int PersonId {
+        public int PersonID {
             get {
-                return this.PersonIdField;
+                return this.PersonIDField;
             }
             set {
-                if ((this.PersonIdField.Equals(value) != true)) {
-                    this.PersonIdField = value;
-                    this.RaisePropertyChanged("PersonId");
+                if ((this.PersonIDField.Equals(value) != true)) {
+                    this.PersonIDField = value;
+                    this.RaisePropertyChanged("PersonID");
                 }
             }
         }
@@ -165,7 +165,7 @@ namespace WpfWebClient.ServiceReferenceEHEC {
         private System.Runtime.Serialization.ExtensionDataObject extensionDataField;
         
         [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private int CityIdField;
+        private int CityIDField;
         
         [System.Runtime.Serialization.OptionalFieldAttribute()]
         private WpfWebClient.ServiceReferenceEHEC.Country CountryField;
@@ -187,14 +187,14 @@ namespace WpfWebClient.ServiceReferenceEHEC {
         }
         
         [System.Runtime.Serialization.DataMemberAttribute()]
-        public int CityId {
+        public int CityID {
             get {
-                return this.CityIdField;
+                return this.CityIDField;
             }
             set {
-                if ((this.CityIdField.Equals(value) != true)) {
-                    this.CityIdField = value;
-                    this.RaisePropertyChanged("CityId");
+                if ((this.CityIDField.Equals(value) != true)) {
+                    this.CityIDField = value;
+                    this.RaisePropertyChanged("CityID");
                 }
             }
         }
@@ -258,7 +258,7 @@ namespace WpfWebClient.ServiceReferenceEHEC {
         private System.Runtime.Serialization.ExtensionDataObject extensionDataField;
         
         [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private int GenderIdField;
+        private int GenderIDField;
         
         [System.Runtime.Serialization.OptionalFieldAttribute()]
         private string NameField;
@@ -274,14 +274,14 @@ namespace WpfWebClient.ServiceReferenceEHEC {
         }
         
         [System.Runtime.Serialization.DataMemberAttribute()]
-        public int GenderId {
+        public int GenderID {
             get {
-                return this.GenderIdField;
+                return this.GenderIDField;
             }
             set {
-                if ((this.GenderIdField.Equals(value) != true)) {
-                    this.GenderIdField = value;
-                    this.RaisePropertyChanged("GenderId");
+                if ((this.GenderIDField.Equals(value) != true)) {
+                    this.GenderIDField = value;
+                    this.RaisePropertyChanged("GenderID");
                 }
             }
         }
@@ -322,7 +322,7 @@ namespace WpfWebClient.ServiceReferenceEHEC {
         private string NameField;
         
         [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private int SalutationIdField;
+        private int SalutationIDField;
         
         [global::System.ComponentModel.BrowsableAttribute(false)]
         public System.Runtime.Serialization.ExtensionDataObject ExtensionData {
@@ -348,14 +348,14 @@ namespace WpfWebClient.ServiceReferenceEHEC {
         }
         
         [System.Runtime.Serialization.DataMemberAttribute()]
-        public int SalutationId {
+        public int SalutationID {
             get {
-                return this.SalutationIdField;
+                return this.SalutationIDField;
             }
             set {
-                if ((this.SalutationIdField.Equals(value) != true)) {
-                    this.SalutationIdField = value;
-                    this.RaisePropertyChanged("SalutationId");
+                if ((this.SalutationIDField.Equals(value) != true)) {
+                    this.SalutationIDField = value;
+                    this.RaisePropertyChanged("SalutationID");
                 }
             }
         }
@@ -377,33 +377,17 @@ namespace WpfWebClient.ServiceReferenceEHEC {
     public partial class Doctor : WpfWebClient.ServiceReferenceEHEC.Person {
         
         [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private int DoctorIdField;
-        
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private WpfWebClient.ServiceReferenceEHEC.Status StatusField;
+        private int DoctorIDField;
         
         [System.Runtime.Serialization.DataMemberAttribute()]
-        public int DoctorId {
+        public int DoctorID {
             get {
-                return this.DoctorIdField;
+                return this.DoctorIDField;
             }
             set {
-                if ((this.DoctorIdField.Equals(value) != true)) {
-                    this.DoctorIdField = value;
-                    this.RaisePropertyChanged("DoctorId");
-                }
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute()]
-        public WpfWebClient.ServiceReferenceEHEC.Status Status {
-            get {
-                return this.StatusField;
-            }
-            set {
-                if ((object.ReferenceEquals(this.StatusField, value) != true)) {
-                    this.StatusField = value;
-                    this.RaisePropertyChanged("Status");
+                if ((this.DoctorIDField.Equals(value) != true)) {
+                    this.DoctorIDField = value;
+                    this.RaisePropertyChanged("DoctorID");
                 }
             }
         }
@@ -419,7 +403,7 @@ namespace WpfWebClient.ServiceReferenceEHEC {
         private System.Runtime.Serialization.ExtensionDataObject extensionDataField;
         
         [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private int CountryIdField;
+        private int CountryIDField;
         
         [System.Runtime.Serialization.OptionalFieldAttribute()]
         private string NameField;
@@ -435,14 +419,14 @@ namespace WpfWebClient.ServiceReferenceEHEC {
         }
         
         [System.Runtime.Serialization.DataMemberAttribute()]
-        public int CountryId {
+        public int CountryID {
             get {
-                return this.CountryIdField;
+                return this.CountryIDField;
             }
             set {
-                if ((this.CountryIdField.Equals(value) != true)) {
-                    this.CountryIdField = value;
-                    this.RaisePropertyChanged("CountryId");
+                if ((this.CountryIDField.Equals(value) != true)) {
+                    this.CountryIDField = value;
+                    this.RaisePropertyChanged("CountryID");
                 }
             }
         }
@@ -470,67 +454,6 @@ namespace WpfWebClient.ServiceReferenceEHEC {
         }
     }
     
-    [System.Diagnostics.DebuggerStepThroughAttribute()]
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
-    [System.Runtime.Serialization.DataContractAttribute(Name="Status", Namespace="http://schemas.datacontract.org/2004/07/Server.Models")]
-    [System.SerializableAttribute()]
-    public partial class Status : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged {
-        
-        [System.NonSerializedAttribute()]
-        private System.Runtime.Serialization.ExtensionDataObject extensionDataField;
-        
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private string NameField;
-        
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private int StatusIdField;
-        
-        [global::System.ComponentModel.BrowsableAttribute(false)]
-        public System.Runtime.Serialization.ExtensionDataObject ExtensionData {
-            get {
-                return this.extensionDataField;
-            }
-            set {
-                this.extensionDataField = value;
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute()]
-        public string Name {
-            get {
-                return this.NameField;
-            }
-            set {
-                if ((object.ReferenceEquals(this.NameField, value) != true)) {
-                    this.NameField = value;
-                    this.RaisePropertyChanged("Name");
-                }
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute()]
-        public int StatusId {
-            get {
-                return this.StatusIdField;
-            }
-            set {
-                if ((this.StatusIdField.Equals(value) != true)) {
-                    this.StatusIdField = value;
-                    this.RaisePropertyChanged("StatusId");
-                }
-            }
-        }
-        
-        public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
-        
-        protected void RaisePropertyChanged(string propertyName) {
-            System.ComponentModel.PropertyChangedEventHandler propertyChanged = this.PropertyChanged;
-            if ((propertyChanged != null)) {
-                propertyChanged(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName));
-            }
-        }
-    }
-    
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
     [System.Runtime.Serialization.DataContractAttribute(Name="Exam", Namespace="http://schemas.datacontract.org/2004/07/Server.Models")]
@@ -547,7 +470,7 @@ namespace WpfWebClient.ServiceReferenceEHEC {
         private WpfWebClient.ServiceReferenceEHEC.Doctor DoctorField;
         
         [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private int ExamIdField;
+        private int ExamIDField;
         
         [System.Runtime.Serialization.OptionalFieldAttribute()]
         private WpfWebClient.ServiceReferenceEHEC.Person PatientField;
@@ -592,14 +515,14 @@ namespace WpfWebClient.ServiceReferenceEHEC {
         }
         
         [System.Runtime.Serialization.DataMemberAttribute()]
-        public int ExamId {
+        public int ExamID {
             get {
-                return this.ExamIdField;
+                return this.ExamIDField;
             }
             set {
-                if ((this.ExamIdField.Equals(value) != true)) {
-                    this.ExamIdField = value;
-                    this.RaisePropertyChanged("ExamId");
+                if ((this.ExamIDField.Equals(value) != true)) {
+                    this.ExamIDField = value;
+                    this.RaisePropertyChanged("ExamID");
                 }
             }
         }
@@ -652,14 +575,11 @@ namespace WpfWebClient.ServiceReferenceEHEC {
         [System.Runtime.Serialization.OptionalFieldAttribute()]
         private string DescriptionField;
         
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private bool InfectedField;
-        
         [System.Runtime.Serialization.OptionalFieldAttribute()]
         private string NameField;
         
         [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private int ResultIdField;
+        private int ResultIDField;
         
         [System.Runtime.Serialization.OptionalFieldAttribute()]
         private WpfWebClient.ServiceReferenceEHEC.Strain StrainField;
@@ -687,19 +607,6 @@ namespace WpfWebClient.ServiceReferenceEHEC {
             }
         }
         
-        [System.Runtime.Serialization.DataMemberAttribute()]
-        public bool Infected {
-            get {
-                return this.InfectedField;
-            }
-            set {
-                if ((this.InfectedField.Equals(value) != true)) {
-                    this.InfectedField = value;
-                    this.RaisePropertyChanged("Infected");
-                }
-            }
-        }
-        
         [System.Runtime.Serialization.DataMemberAttribute()]
         public string Name {
             get {
@@ -714,14 +621,14 @@ namespace WpfWebClient.ServiceReferenceEHEC {
         }
         
         [System.Runtime.Serialization.DataMemberAttribute()]
-        public int ResultId {
+        public int ResultID {
             get {
-                return this.ResultIdField;
+                return this.ResultIDField;
             }
             set {
-                if ((this.ResultIdField.Equals(value) != true)) {
-                    this.ResultIdField = value;
-                    this.RaisePropertyChanged("ResultId");
+                if ((this.ResultIDField.Equals(value) != true)) {
+                    this.ResultIDField = value;
+                    this.RaisePropertyChanged("ResultID");
                 }
             }
         }
@@ -762,7 +669,7 @@ namespace WpfWebClient.ServiceReferenceEHEC {
         private string NameField;
         
         [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private int StrainIdField;
+        private int StrainIDField;
         
         [global::System.ComponentModel.BrowsableAttribute(false)]
         public System.Runtime.Serialization.ExtensionDataObject ExtensionData {
@@ -788,14 +695,14 @@ namespace WpfWebClient.ServiceReferenceEHEC {
         }
         
         [System.Runtime.Serialization.DataMemberAttribute()]
-        public int StrainId {
+        public int StrainID {
             get {
-                return this.StrainIdField;
+                return this.StrainIDField;
             }
             set {
-                if ((this.StrainIdField.Equals(value) != true)) {
-                    this.StrainIdField = value;
-                    this.RaisePropertyChanged("StrainId");
+                if ((this.StrainIDField.Equals(value) != true)) {
+                    this.StrainIDField = value;
+                    this.RaisePropertyChanged("StrainID");
                 }
             }
         }
diff --git a/WebClient/WpfWebClient/Connected Services/ServiceReferenceEHEC/Service2.xsd b/WebClient/WpfWebClient/Connected Services/ServiceReferenceEHEC/Service2.xsd
index e01f36c..90d341c 100644
--- a/WebClient/WpfWebClient/Connected Services/ServiceReferenceEHEC/Service2.xsd	
+++ b/WebClient/WpfWebClient/Connected Services/ServiceReferenceEHEC/Service2.xsd	
@@ -6,7 +6,7 @@
       <xs:element minOccurs="0" name="FirstName" nillable="true" type="xs:string" />
       <xs:element minOccurs="0" name="Gender" nillable="true" type="tns:Gender" />
       <xs:element minOccurs="0" name="LastName" nillable="true" type="xs:string" />
-      <xs:element minOccurs="0" name="PersonId" type="xs:int" />
+      <xs:element minOccurs="0" name="PersonID" type="xs:int" />
       <xs:element minOccurs="0" name="Salutation" nillable="true" type="tns:Salutation" />
       <xs:element minOccurs="0" name="StreetName" nillable="true" type="xs:string" />
     </xs:sequence>
@@ -14,7 +14,7 @@
   <xs:element name="Person" nillable="true" type="tns:Person" />
   <xs:complexType name="City">
     <xs:sequence>
-      <xs:element minOccurs="0" name="CityId" type="xs:int" />
+      <xs:element minOccurs="0" name="CityID" type="xs:int" />
       <xs:element minOccurs="0" name="Country" nillable="true" type="tns:Country" />
       <xs:element minOccurs="0" name="Name" nillable="true" type="xs:string" />
       <xs:element minOccurs="0" name="ZipCode" type="xs:int" />
@@ -23,14 +23,14 @@
   <xs:element name="City" nillable="true" type="tns:City" />
   <xs:complexType name="Country">
     <xs:sequence>
-      <xs:element minOccurs="0" name="CountryId" type="xs:int" />
+      <xs:element minOccurs="0" name="CountryID" type="xs:int" />
       <xs:element minOccurs="0" name="Name" nillable="true" type="xs:string" />
     </xs:sequence>
   </xs:complexType>
   <xs:element name="Country" nillable="true" type="tns:Country" />
   <xs:complexType name="Gender">
     <xs:sequence>
-      <xs:element minOccurs="0" name="GenderId" type="xs:int" />
+      <xs:element minOccurs="0" name="GenderID" type="xs:int" />
       <xs:element minOccurs="0" name="Name" nillable="true" type="xs:string" />
     </xs:sequence>
   </xs:complexType>
@@ -38,7 +38,7 @@
   <xs:complexType name="Salutation">
     <xs:sequence>
       <xs:element minOccurs="0" name="Name" nillable="true" type="xs:string" />
-      <xs:element minOccurs="0" name="SalutationId" type="xs:int" />
+      <xs:element minOccurs="0" name="SalutationID" type="xs:int" />
     </xs:sequence>
   </xs:complexType>
   <xs:element name="Salutation" nillable="true" type="tns:Salutation" />
@@ -46,7 +46,7 @@
     <xs:sequence>
       <xs:element minOccurs="0" name="Date" type="xs:dateTime" />
       <xs:element minOccurs="0" name="Doctor" nillable="true" type="tns:Doctor" />
-      <xs:element minOccurs="0" name="ExamId" type="xs:int" />
+      <xs:element minOccurs="0" name="ExamID" type="xs:int" />
       <xs:element minOccurs="0" name="Patient" nillable="true" type="tns:Person" />
       <xs:element minOccurs="0" name="Result" nillable="true" type="tns:Result" />
     </xs:sequence>
@@ -56,26 +56,17 @@
     <xs:complexContent mixed="false">
       <xs:extension base="tns:Person">
         <xs:sequence>
-          <xs:element minOccurs="0" name="DoctorId" type="xs:int" />
-          <xs:element minOccurs="0" name="Status" nillable="true" type="tns:Status" />
+          <xs:element minOccurs="0" name="DoctorID" type="xs:int" />
         </xs:sequence>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
   <xs:element name="Doctor" nillable="true" type="tns:Doctor" />
-  <xs:complexType name="Status">
-    <xs:sequence>
-      <xs:element minOccurs="0" name="Name" nillable="true" type="xs:string" />
-      <xs:element minOccurs="0" name="StatusId" type="xs:int" />
-    </xs:sequence>
-  </xs:complexType>
-  <xs:element name="Status" nillable="true" type="tns:Status" />
   <xs:complexType name="Result">
     <xs:sequence>
       <xs:element minOccurs="0" name="Description" nillable="true" type="xs:string" />
-      <xs:element minOccurs="0" name="Infected" type="xs:boolean" />
       <xs:element minOccurs="0" name="Name" nillable="true" type="xs:string" />
-      <xs:element minOccurs="0" name="ResultId" type="xs:int" />
+      <xs:element minOccurs="0" name="ResultID" type="xs:int" />
       <xs:element minOccurs="0" name="Strain" nillable="true" type="tns:Strain" />
     </xs:sequence>
   </xs:complexType>
@@ -83,7 +74,7 @@
   <xs:complexType name="Strain">
     <xs:sequence>
       <xs:element minOccurs="0" name="Name" nillable="true" type="xs:string" />
-      <xs:element minOccurs="0" name="StrainId" type="xs:int" />
+      <xs:element minOccurs="0" name="StrainID" type="xs:int" />
     </xs:sequence>
   </xs:complexType>
   <xs:element name="Strain" nillable="true" type="tns:Strain" />
diff --git a/WebClient/WpfWebClient/Home.xaml b/WebClient/WpfWebClient/Home.xaml
index 9464daa..1c7ea30 100644
--- a/WebClient/WpfWebClient/Home.xaml
+++ b/WebClient/WpfWebClient/Home.xaml
@@ -10,8 +10,7 @@
 
     <Grid Width="593" Height="565">
         <Label Content="Willkommen" HorizontalAlignment="Left" Margin="10,10,0,0" VerticalAlignment="Top" FontFamily="Tahoma" FontSize="48" Height="61" Width="272"/>
-        <TextBlock HorizontalAlignment="Left" Margin="10,124,0,0" TextWrapping="Wrap" Text="Haben Sie die Applikation zum ersten Mal gestartet? In diesem Fall nutzen Sie die vorhandene Funktion zum erstellen von einigen Patienten." VerticalAlignment="Top" Height="89" Width="573" FontSize="20"/>
-        <Button Content="Generate Patients" HorizontalAlignment="Left" Margin="398,234,0,0" VerticalAlignment="Top" Width="147" Height="59" FontSize="18" Click="Button_Click_GeneratePatients"/>
+        <TextBlock HorizontalAlignment="Left" Margin="10,124,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Height="356" Width="573" FontSize="20"><Run Text="Haben Sie die Applikation zum ersten Mal gestartet"/><Run Text="?"/><LineBreak/><Run/><LineBreak/><Run Text="1. Erstellen Sie neue Patienten"/><LineBreak/><Run Text="2. Erfassen Sie neue Bakterienstämme"/><LineBreak/><Run Text="3. Erfassen Sie einen neuen Fall"/><LineBreak/><Run/><LineBreak/><Run/></TextBlock>
 
     </Grid>
 </Page>
diff --git a/WebClient/WpfWebClient/Home.xaml.cs b/WebClient/WpfWebClient/Home.xaml.cs
index f7f0eed..e652767 100644
--- a/WebClient/WpfWebClient/Home.xaml.cs
+++ b/WebClient/WpfWebClient/Home.xaml.cs
@@ -26,26 +26,5 @@ namespace WpfWebClient
             InitializeComponent();
         }
 
-        private void Button_Click_GeneratePatients(object sender, RoutedEventArgs e)
-        {
-
-            WpfWebClient.ServiceReferenceEHEC.ServiceClient client = new WpfWebClient.ServiceReferenceEHEC.ServiceClient();
-            Person p = new Person();
-
-            //p.City = 1;
-            p.FirstName = "Lucas";
-            p.LastName = "Meier";
-            p.StreetName = "Hansestrasse";
-            //p.Salutation = 1;
-            //p.Gender = 1;
-
-
-
-            // Patient an Webservice übermitteln
-            client.WritePatient(p);
-
-            // Client schliessen
-            client.Close();
-        }
     }
 }
diff --git a/WebClient/WpfWebClient/MainWindow.xaml b/WebClient/WpfWebClient/MainWindow.xaml
index e012d82..d44289e 100644
--- a/WebClient/WpfWebClient/MainWindow.xaml
+++ b/WebClient/WpfWebClient/MainWindow.xaml
@@ -20,6 +20,6 @@
             <Button Content="View Strains" HorizontalAlignment="Left" Margin="10,400,0,0" VerticalAlignment="Top" Width="190" Height="66" FontFamily="Tahoma" FontSize="24" Click="Button_Click_ViewStrains"/>
         </Grid>
         <Grid Grid.Column="1" HorizontalAlignment="Right" Height="565" VerticalAlignment="Top" Width="593"/>
-        <Frame x:Name="Main" HorizontalAlignment="Left" Width="593" Grid.Column="1" NavigationUIVisibility="Hidden"/>
+        <Frame x:Name="Main" HorizontalAlignment="Left" Width="593" Grid.Column="1" NavigationUIVisibility="Hidden" Navigated="Main_Navigated" Margin="0" UseLayoutRounding="False"/>
     </Grid>
 </Window>
diff --git a/WebClient/WpfWebClient/MainWindow.xaml.cs b/WebClient/WpfWebClient/MainWindow.xaml.cs
index 6b44e7f..3fc91bd 100644
--- a/WebClient/WpfWebClient/MainWindow.xaml.cs
+++ b/WebClient/WpfWebClient/MainWindow.xaml.cs
@@ -44,5 +44,10 @@ namespace WpfWebClient
         {
             Main.Content = new Home();
         }
+
+        private void Main_Navigated(object sender, NavigationEventArgs e)
+        {
+
+        }
     }
 }
diff --git a/WebClient/WpfWebClient/PatientForm.xaml b/WebClient/WpfWebClient/PatientForm.xaml
index 5a7e8f1..fb47b73 100644
--- a/WebClient/WpfWebClient/PatientForm.xaml
+++ b/WebClient/WpfWebClient/PatientForm.xaml
@@ -14,14 +14,21 @@
             <RowDefinition Height="523*"/>
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="160*"/>
-            <ColumnDefinition Width="433*"/>
+            <ColumnDefinition Width="138*"/>
+            <ColumnDefinition Width="455*"/>
         </Grid.ColumnDefinitions>
-        <Label Content="Add new Case" HorizontalAlignment="Left" VerticalAlignment="Top" Height="35" Width="433" FontFamily="Tahoma" FontSize="24" Margin="0,-3,0,0" Grid.Column="1"/>
-        <Label Content="Name" HorizontalAlignment="Left" Margin="28,100,0,0" Grid.Row="1" VerticalAlignment="Top" Height="43" Width="160" FontFamily="Tahoma" FontSize="24" Grid.ColumnSpan="2"/>
-        <Label Content="Vorname" HorizontalAlignment="Left" Margin="28,143,0,0" Grid.Row="1" VerticalAlignment="Top" Height="43" Width="160" FontFamily="Tahoma" FontSize="24" Grid.ColumnSpan="2"/>
-        <Label Content="Name" HorizontalAlignment="Left" Margin="28,186,0,0" Grid.Row="1" VerticalAlignment="Top" Height="43" Width="160" FontFamily="Tahoma" FontSize="24" Grid.ColumnSpan="2"/>
-        <Label Content="Name" HorizontalAlignment="Left" Margin="28,229,0,0" Grid.Row="1" VerticalAlignment="Top" Height="43" Width="160" FontFamily="Tahoma" FontSize="24" Grid.ColumnSpan="2"/>
-        <Label Content="Name" HorizontalAlignment="Left" Margin="28,272,0,0" Grid.Row="1" VerticalAlignment="Top" Height="43" Width="160" FontFamily="Tahoma" FontSize="24" Grid.ColumnSpan="2"/>
+        <Label Content="Neuen Patienten anlegen" HorizontalAlignment="Left" VerticalAlignment="Top" Height="35" Width="433" FontFamily="Tahoma" FontSize="24" Margin="0,-3,0,0" Grid.Column="1"/>
+        <Label Content="Name" HorizontalAlignment="Left" Margin="10,104,0,0" Grid.Row="1" VerticalAlignment="Top" Height="34" Width="104" FontFamily="Tahoma" FontSize="24"/>
+        <Label Content="Vorname" HorizontalAlignment="Left" Margin="10,152,0,0" Grid.Row="1" VerticalAlignment="Top" Height="34" Width="104" FontFamily="Tahoma" FontSize="24"/>
+        <Label Content="Strasse" HorizontalAlignment="Left" Margin="10,201,0,0" Grid.Row="1" VerticalAlignment="Top" Height="34" Width="104" FontFamily="Tahoma" FontSize="24"/>
+        <Label Content="Ort" HorizontalAlignment="Left" Margin="10,248,0,0" Grid.Row="1" VerticalAlignment="Top" Height="34" Width="75" FontFamily="Tahoma" FontSize="24"/>
+        <Label Content="Arzt" HorizontalAlignment="Left" Margin="10,294,0,0" Grid.Row="1" VerticalAlignment="Top" Height="34" Width="75" FontFamily="Tahoma" FontSize="24" RenderTransformOrigin="0.533,1.244"/>
+        <Label Content="Anrede" HorizontalAlignment="Left" Margin="10,61,0,0" Grid.Row="1" VerticalAlignment="Top" Height="34" Width="104" FontSize="24" FontFamily="Tahoma"/>
+        <TextBox x:Name="txtAnrede" Grid.Column="1" HorizontalAlignment="Left" Height="34" Margin="0,61,0,0" Grid.Row="1" TextWrapping="Wrap" Text="TextBox" VerticalAlignment="Top" Width="455"/>
+        <TextBox x:Name="txtName" Grid.Column="1" HorizontalAlignment="Left" Height="34" Margin="0,104,0,0" Grid.Row="1" TextWrapping="Wrap" Text="TextBox" VerticalAlignment="Top" Width="455"/>
+        <TextBox x:Name="txtVorname" Grid.Column="1" HorizontalAlignment="Left" Height="34" Margin="0,152,0,0" Grid.Row="1" TextWrapping="Wrap" Text="TextBox" VerticalAlignment="Top" Width="455"/>
+        <TextBox x:Name="txtStrasse" Grid.Column="1" HorizontalAlignment="Left" Height="34" Margin="0,201,0,0" Grid.Row="1" TextWrapping="Wrap" Text="TextBox" VerticalAlignment="Top" Width="455"/>
+        <TextBox x:Name="txtOrt" Grid.Column="1" HorizontalAlignment="Left" Height="34" Margin="0,248,0,0" Grid.Row="1" TextWrapping="Wrap" Text="TextBox" VerticalAlignment="Top" Width="455"/>
+        <ListBox x:Name="listBoxArzt" Grid.Column="1" HorizontalAlignment="Left" Height="129" Margin="0,294,0,0" Grid.Row="1" VerticalAlignment="Top" Width="455"/>
     </Grid>
 </Page>
diff --git a/WebClient/WpfWebClient/PatientForm.xaml.cs b/WebClient/WpfWebClient/PatientForm.xaml.cs
index 042d386..b41c59a 100644
--- a/WebClient/WpfWebClient/PatientForm.xaml.cs
+++ b/WebClient/WpfWebClient/PatientForm.xaml.cs
@@ -28,7 +28,10 @@ namespace WpfWebClient
 
             Person p = new Person();
 
-            
+            p.FirstName = txtVorname.ToString();
+            p.LastName = txtName.ToString();
+            p.StreetName = txtStrasse.ToString();
+
 
 
             client.WritePatient(p);
diff --git a/WebClient/WpfWebClient/ViewDoctors.xaml b/WebClient/WpfWebClient/ViewDoctors.xaml
index d77cf5c..0ed7898 100644
--- a/WebClient/WpfWebClient/ViewDoctors.xaml
+++ b/WebClient/WpfWebClient/ViewDoctors.xaml
@@ -9,6 +9,7 @@
       Title="ViewDoctors" Width="593" Height="565">
 
     <Grid Width="593" Height="565">
-        <Label Content="View Doctors" HorizontalAlignment="Left" VerticalAlignment="Top" Height="35" Width="433" FontFamily="Tahoma" FontSize="24" Margin="160,-3,0,0"/>
+        <DataGrid x:Name="DataGridViewDoctors" HorizontalAlignment="Left" Height="565" VerticalAlignment="Top" Width="593"/>
+
     </Grid>
 </Page>
diff --git a/WebClient/WpfWebClient/ViewDoctors.xaml.cs b/WebClient/WpfWebClient/ViewDoctors.xaml.cs
index 487382a..49af73f 100644
--- a/WebClient/WpfWebClient/ViewDoctors.xaml.cs
+++ b/WebClient/WpfWebClient/ViewDoctors.xaml.cs
@@ -12,6 +12,7 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
+using WpfWebClient.ServiceReferenceEHEC;
 
 namespace WpfWebClient
 {
@@ -27,8 +28,14 @@ namespace WpfWebClient
 
             WpfWebClient.ServiceReferenceEHEC.ServiceClient client = new WpfWebClient.ServiceReferenceEHEC.ServiceClient();
 
-            client.GetDoctors();
-            
+            //var doctors = client.GetDoctors();
+
+            List<WpfWebClient.ServiceReferenceEHEC.Doctor> doctorlist = new List<ServiceReferenceEHEC.Doctor>(client.GetDoctors());
+
+
+
+            DataGridViewDoctors.ItemsSource = doctorlist;
+
         }
     }
 }
diff --git a/WebClient/WpfWebClient/ViewStrains.xaml b/WebClient/WpfWebClient/ViewStrains.xaml
index 693ab41..a1ea946 100644
--- a/WebClient/WpfWebClient/ViewStrains.xaml
+++ b/WebClient/WpfWebClient/ViewStrains.xaml
@@ -9,7 +9,6 @@
       Title="ViewCases" Width="593" Height="565">
 
     <Grid Width="593" Height="565">
-        <Label Content="View Strains" HorizontalAlignment="Left" VerticalAlignment="Top" Height="35" Width="433" FontFamily="Tahoma" FontSize="24" Margin="160,-3,0,0"/>
-
+        <DataGrid x:Name="DataGridViewStrains" HorizontalAlignment="Left" Height="565" VerticalAlignment="Top" Width="593"/>
     </Grid>
 </Page>
diff --git a/WebClient/WpfWebClient/ViewStrains.xaml.cs b/WebClient/WpfWebClient/ViewStrains.xaml.cs
index 169b900..004cbab 100644
--- a/WebClient/WpfWebClient/ViewStrains.xaml.cs
+++ b/WebClient/WpfWebClient/ViewStrains.xaml.cs
@@ -12,6 +12,7 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
+using WpfWebClient.ServiceReferenceEHEC;
 
 namespace WpfWebClient
 {
@@ -20,6 +21,20 @@ namespace WpfWebClient
     /// </summary>
     public partial class ViewStrains : Page
     {
-        public ViewStrains() => InitializeComponent();
+        public ViewStrains()
+        {
+            InitializeComponent();
+
+            WpfWebClient.ServiceReferenceEHEC.ServiceClient client = new WpfWebClient.ServiceReferenceEHEC.ServiceClient();
+
+            //var doctors = client.GetDoctors();
+
+            //List<WpfWebClient.ServiceReferenceEHEC.Doctor> doctorlist = new List<ServiceReferenceEHEC.Doctor>(client.GetStrains());
+
+
+
+            //DataGridViewStrains.ItemsSource = doctorlist;
+        }
+
     }
 }