diff --git a/WebClient/WpfWebClient/App.config b/WebClient/WpfWebClient/App.config
index bd946c2..39ddb92 100644
--- a/WebClient/WpfWebClient/App.config
+++ b/WebClient/WpfWebClient/App.config
@@ -6,7 +6,7 @@
     <system.serviceModel>
         <bindings>
             <basicHttpBinding>
-                <binding  name="BasicHttpBinding_IService" maxBufferSize="64000000" maxReceivedMessageSize="64000000"/>
+                <binding name="BasicHttpBinding_IService" maxBufferSize="64000000" maxReceivedMessageSize="64000000" />
             </basicHttpBinding>
         </bindings>
         <client>
diff --git a/WebClient/WpfWebClient/Connected Services/ServiceReferenceEHEC/Reference.svcmap b/WebClient/WpfWebClient/Connected Services/ServiceReferenceEHEC/Reference.svcmap
index bad882e..eddd7d5 100644
--- a/WebClient/WpfWebClient/Connected Services/ServiceReferenceEHEC/Reference.svcmap	
+++ b/WebClient/WpfWebClient/Connected Services/ServiceReferenceEHEC/Reference.svcmap	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ReferenceGroup xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ID="8e4f3edd-51fa-4c88-be86-294051ef649d" xmlns="urn:schemas-microsoft-com:xml-wcfservicemap">
+<ReferenceGroup xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ID="ceaefb33-d2bd-40c8-8ef7-cf183b6daf15" xmlns="urn:schemas-microsoft-com:xml-wcfservicemap">
   <ClientOptions>
     <GenerateAsynchronousMethods>false</GenerateAsynchronousMethods>
     <GenerateTaskBasedAsynchronousMethod>true</GenerateTaskBasedAsynchronousMethod>
@@ -22,11 +22,11 @@
     <MetadataSource Address="http://localhost:8000/Service.svc" Protocol="http" SourceId="1" />
   </MetadataSources>
   <Metadata>
-    <MetadataFile FileName="Service.xsd" MetadataType="Schema" ID="198fa5c2-33a6-4c44-b458-b5e50e997a82" SourceId="1" SourceUrl="http://localhost:8000/Service.svc?xsd=xsd0" />
-    <MetadataFile FileName="Service.wsdl" MetadataType="Wsdl" ID="bc6ac9a0-15c4-45e4-a373-a025bb3eeff5" SourceId="1" SourceUrl="http://localhost:8000/Service.svc?wsdl" />
-    <MetadataFile FileName="Service.disco" MetadataType="Disco" ID="a8cc90ab-4861-4d1a-b9ab-475e06c8828f" SourceId="1" SourceUrl="http://localhost:8000/Service.svc?disco" />
-    <MetadataFile FileName="Service1.xsd" MetadataType="Schema" ID="fd5859cf-36b9-49da-a06c-2b2ab351c9e8" SourceId="1" SourceUrl="http://localhost:8000/Service.svc?xsd=xsd1" />
-    <MetadataFile FileName="Service2.xsd" MetadataType="Schema" ID="53346a32-0a8b-4bc8-862d-2b724486f091" SourceId="1" SourceUrl="http://localhost:8000/Service.svc?xsd=xsd2" />
+    <MetadataFile FileName="Service.xsd" MetadataType="Schema" ID="55448dd8-d070-4e55-8d5d-da25476d738e" SourceId="1" SourceUrl="http://localhost:8000/Service.svc?xsd=xsd0" />
+    <MetadataFile FileName="Service.wsdl" MetadataType="Wsdl" ID="35362244-835e-40eb-bb5b-f0d601205450" SourceId="1" SourceUrl="http://localhost:8000/Service.svc?wsdl" />
+    <MetadataFile FileName="Service.disco" MetadataType="Disco" ID="46420a14-e14a-4898-a880-57c13420af82" SourceId="1" SourceUrl="http://localhost:8000/Service.svc?disco" />
+    <MetadataFile FileName="Service1.xsd" MetadataType="Schema" ID="559908da-70da-485b-9a95-4385db903b49" SourceId="1" SourceUrl="http://localhost:8000/Service.svc?xsd=xsd1" />
+    <MetadataFile FileName="Service2.xsd" MetadataType="Schema" ID="8e1f51f2-a819-4661-bf65-82a9ed37338a" SourceId="1" SourceUrl="http://localhost:8000/Service.svc?xsd=xsd2" />
   </Metadata>
   <Extensions>
     <ExtensionFile FileName="configuration91.svcinfo" Name="configuration91.svcinfo" />
diff --git a/WebClient/WpfWebClient/Helper/GenerateTestData.cs b/WebClient/WpfWebClient/Helper/GenerateTestData.cs
index 1d2d193..b095fea 100644
--- a/WebClient/WpfWebClient/Helper/GenerateTestData.cs
+++ b/WebClient/WpfWebClient/Helper/GenerateTestData.cs
@@ -95,9 +95,15 @@ namespace WpfWebClient.Helper
 
             do
             {
-                patf.FoodPlace = (FoodPlace)foodPlaces.OrderBy(x => random.Next()).Take(1);
-                patf.Patient = (Person)patients.OrderBy(x => random.Next()).Take(1);
-                patf.PatientID = i;
+                int randnumFP = random.Next(0, foodPlaces.Count());
+                FoodPlace foodpl = foodPlaces[randnumFP];
+
+                int randnumP = random.Next(0, patients.Count());
+                Person patient = patients[randnumP];
+                
+                patf.FoodPlace = foodpl;
+                patf.Patient = patient;
+                //patf.PatientID = i;
                 patf.VistingDate = new DateTime(2005, 12, 20);
 
                 PatientsAtFoodPlaces.Add(patf);
diff --git a/WebClient/WpfWebClient/WpfWebClient.csproj b/WebClient/WpfWebClient/WpfWebClient.csproj
index d804d43..d299a22 100644
--- a/WebClient/WpfWebClient/WpfWebClient.csproj
+++ b/WebClient/WpfWebClient/WpfWebClient.csproj
@@ -56,6 +56,11 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
+    <Compile Include="Connected Services\ServiceReferenceEHEC\Reference.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Reference.svcmap</DependentUpon>
+    </Compile>
     <Compile Include="ExamForm.xaml.cs">
       <DependentUpon>ExamForm.xaml</DependentUpon>
     </Compile>
@@ -94,11 +99,6 @@
       <DependentUpon>App.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Connected Services\ServiceReferenceEHEC\Reference.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Reference.svcmap</DependentUpon>
-    </Compile>
     <Compile Include="MainWindow.xaml.cs">
       <DependentUpon>MainWindow.xaml</DependentUpon>
       <SubType>Code</SubType>
@@ -186,6 +186,9 @@
   <ItemGroup>
     <WCFMetadata Include="Connected Services\" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\eheclogo.png" />
+  </ItemGroup>
   <ItemGroup>
     <WCFMetadataStorage Include="Connected Services\ServiceReferenceEHEC\" />
   </ItemGroup>
@@ -204,8 +207,5 @@
       <LastGenOutput>Reference.cs</LastGenOutput>
     </None>
   </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Images\eheclogo.png" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file