diff --git a/eDos/AddLimitAgent.aspx b/eDos/AddLimitAgent.aspx
index 48fd97d..13bfda6 100644
--- a/eDos/AddLimitAgent.aspx
+++ b/eDos/AddLimitAgent.aspx
@@ -132,7 +132,7 @@
     </telerik:RadGrid>
 
     <asp:SqlDataSource ID="sqlDSV_AddLimitAgent" runat="server"
-        ConnectionString="<%$ ConnectionStrings:HPH_REMS_newConnectionString %>"
+        ConnectionString="<%$ ConnectionStrings:eDosConnectionString  %>"
         SelectCommand="AddLimitAgentSelect" SelectCommandType="StoredProcedure"
         InsertCommand="AddLimitAgentInsert" InsertCommandType="StoredProcedure"
         UpdateCommand="AddLimitAgentUpdate" UpdateCommandType="StoredProcedure"
@@ -164,8 +164,8 @@
 
     </asp:SqlDataSource>
 
-    <asp:SqlDataSource ID="SqlDSSelectPerson" runat="server" ConnectionString="<%$ ConnectionStrings:HPH_REMS_newConnectionString %>" SelectCommand="PersonList" SelectCommandType="StoredProcedure"></asp:SqlDataSource>
-    <asp:SqlDataSource ID="SqlDSSelectAgentSC" runat="server" ConnectionString="<%$ ConnectionStrings:HPH_REMS_newConnectionString %>" SelectCommand="SELECT [PersID_Resp]=persid, displayName=[LastName]+' '+[FirstName] FROM person; --[V_SelectAgent SC]"></asp:SqlDataSource>
+    <asp:SqlDataSource ID="SqlDSSelectPerson" runat="server" ConnectionString="<%$ ConnectionStrings:eDosConnectionString  %>" SelectCommand="PersonList" SelectCommandType="StoredProcedure"></asp:SqlDataSource>
+    <asp:SqlDataSource ID="SqlDSSelectAgentSC" runat="server" ConnectionString="<%$ ConnectionStrings:eDosConnectionString %>" SelectCommand="AgentList" SelectCommandType="StoredProcedure" ProviderName="System.Data.SqlClient"></asp:SqlDataSource>
 
 
 
diff --git a/eDos/AddLimitHPH.aspx b/eDos/AddLimitHPH.aspx
index 142121f..ad1a1ae 100644
--- a/eDos/AddLimitHPH.aspx
+++ b/eDos/AddLimitHPH.aspx
@@ -130,9 +130,6 @@
                                 
                             </td>
                         </tr>
-                        
-
-
                     </table>
                      <div class="rdfCommandButtons">
                     <hr class="rdfHr" />
@@ -146,7 +143,7 @@
     </telerik:RadGrid>
 
     <asp:SqlDataSource ID="sqlDSV_AddLimitHPH" runat="server"
-        ConnectionString="<%$ ConnectionStrings:HPH_REMS_newConnectionString %>"
+        ConnectionString="<%$ ConnectionStrings:eDosConnectionString %>"
         SelectCommand="AddLimitHPHSelect" SelectCommandType="StoredProcedure"
         InsertCommand="AddLimitHPHInsert" InsertCommandType="StoredProcedure"
         UpdateCommand="AddLimitHPHUpdate" UpdateCommandType="StoredProcedure"
@@ -179,11 +176,8 @@
 
     </asp:SqlDataSource>
 
-    <asp:SqlDataSource ID="SqlDSSelectPerson" runat="server" ConnectionString="<%$ ConnectionStrings:HPH_REMS_newConnectionString %>" SelectCommand="PersonList" SelectCommandType="StoredProcedure"></asp:SqlDataSource>
-    <asp:SqlDataSource ID="SqlDSSelectHPHResp" runat="server" ConnectionString="<%$ ConnectionStrings:HPH_REMS_newConnectionString %>" SelectCommand="SELECT [PersID_Resp], displayName=[LastName]+' '+[FirstName] FROM [V_SelectHPHResp]"></asp:SqlDataSource>
-
-
-
+    <asp:SqlDataSource ID="SqlDSSelectPerson" runat="server" ConnectionString="<%$ ConnectionStrings:eDosConnectionString %>" SelectCommand="PersonList" SelectCommandType="StoredProcedure"></asp:SqlDataSource>
+    <asp:SqlDataSource ID="SqlDSSelectHPHResp" runat="server" ConnectionString="<%$ ConnectionStrings:eDosConnectionString %>" SelectCommand="HPHList" SelectCommandType="StoredProcedure"></asp:SqlDataSource>
 
 
 </asp:Content>
diff --git a/eDos/AlarmEPD.aspx b/eDos/AlarmEPD.aspx
index b8fe025..78b6ac5 100644
--- a/eDos/AlarmEPD.aspx
+++ b/eDos/AlarmEPD.aspx
@@ -49,7 +49,5 @@
             </Columns>
         </MasterTableView>
     </telerik:RadGrid>
-    <asp:SqlDataSource ID="sqlDSAlarmEPD" runat="server"
-        ConnectionString="<%$ ConnectionStrings:HPH_REMS_newConnectionString %>"
-        SelectCommand="SELECT [ID_AlarmEPD], [AlarmEPDName], [EPDRad], [Hp10Dose1], [Hp10Dose2], [Hp07Dose_bis], [HP10Rate1ON], [HP10Rate2ON], [HP07RateON], [HP10Rate1OFF], [HP10Rate2OFF], [HP07RateOFF], [MinWorkerDosisMargin] FROM [AlarmEPD]"></asp:SqlDataSource>
+    <asp:SqlDataSource ID="sqlDSAlarmEPD" runat="server" ConnectionString="<%$ ConnectionStrings:eDosConnectionString %>" SelectCommand="AlarmEPDSelect" SelectCommandType="StoredProcedure" />
 </asp:Content>
diff --git a/eDos/BadgeNotFound.aspx b/eDos/BadgeNotFound.aspx
index 2d2c71f..552559e 100644
--- a/eDos/BadgeNotFound.aspx
+++ b/eDos/BadgeNotFound.aspx
@@ -35,6 +35,6 @@
         </MasterTableView>
     </telerik:RadGrid>
     <asp:SqlDataSource ID="sqlDSBadgeNotFound" runat="server"
-        ConnectionString="<%$ ConnectionStrings:HPH_REMS_newConnectionString %>"
-        SelectCommand="SELECT * FROM [BadgeNotFound] ORDER BY [LastRead] DESC, [FirstRead] DESC"></asp:SqlDataSource>
+        ConnectionString="<%$ ConnectionStrings:eDosConnectionString %>"
+        SelectCommand="GetBadgeNotFound" SelectCommandType="StoredProcedure"></asp:SqlDataSource>
 </asp:Content>
diff --git a/eDos/BadgeNotFound.aspx.cs b/eDos/BadgeNotFound.aspx.cs
index df4d91b..3da7c4d 100644
--- a/eDos/BadgeNotFound.aspx.cs
+++ b/eDos/BadgeNotFound.aspx.cs
@@ -14,7 +14,7 @@ namespace Rems2018
 
             //Zet titel op masterpage
             Literal titelControl = Master.FindControl("PageTitle") as Literal;
-            titelControl.Text = "Alarm EPD";
+            titelControl.Text = "Badges niet gezonden";
 
         }
 
diff --git a/eDos/ClearVisitAlarm.aspx b/eDos/ClearVisitAlarm.aspx
index 2f0b6ca..11f822e 100644
--- a/eDos/ClearVisitAlarm.aspx
+++ b/eDos/ClearVisitAlarm.aspx
@@ -12,60 +12,56 @@
         </ExportSettings>
         <ClientSettings AllowColumnsReorder="True">
         </ClientSettings>
-        <MasterTableView DataKeyNames="ID_Visit" CommandItemDisplay="Top" DataSourceID="SqlDSListVistClear" EditMode="EditForms">
+        <MasterTableView DataKeyNames="ID_Station,ID_Visit" CommandItemDisplay="Top" DataSourceID="SqlDSListVistClear" EditMode="EditForms">
             <CommandItemSettings ShowExportToExcelButton="True" ShowAddNewRecordButton="False" />
             <Columns>
-                
-                  <telerik:GridButtonColumn CommandName="Edit" Text="Edit" ButtonCssClass="rgEdit" UniqueName="EditColumn" HeaderStyle-Width="30px">
-                            <HeaderStyle Width="30px"></HeaderStyle>
-                        </telerik:GridButtonColumn>
-<%--                        <telerik:GridButtonColumn CommandName="Delete" Text="Del" UniqueName="DeleteColumn" ButtonCssClass="rgDel" ConfirmText="Are you sure to delete this?" HeaderStyle-Width="30px"  />--%>
-                <telerik:GridBoundColumn DataField="ID_Visit" DataType="System.Int32"  MaxLength="3" HeaderText="ID" ReadOnly="True" SortExpression="ID_Visit" UniqueName="ID_Visit">
-                </telerik:GridBoundColumn>
-                <telerik:GridCheckBoxColumn DataField="isAlarmCleared" DataType="System.Boolean"  HeaderText="Cleared ?" SortExpression="isAlarmCleared" UniqueName="isAlarmCleared" Groupable="False">
+                <telerik:GridButtonColumn CommandName="Edit" Text="Edit" ButtonCssClass="rgEdit" UniqueName="EditColumn" HeaderStyle-Width="30px">
+                    <HeaderStyle Width="30px"></HeaderStyle>
+                </telerik:GridButtonColumn>
+                <telerik:GridBoundColumn DataField="ID_Station" DataType="System.Int32" MaxLength="3" HeaderText="Station" ReadOnly="True" SortExpression="ID_Station" UniqueName="ID_Station"/>
+                <telerik:GridBoundColumn DataField="ID_Visit" DataType="System.Int32" MaxLength="10" HeaderText="ID" ReadOnly="True" SortExpression="ID_Visit" UniqueName="ID_Visit"/>
+                <telerik:GridCheckBoxColumn DataField="isAlarmCleared" DataType="System.Boolean" HeaderText="Cleared ?" SortExpression="isAlarmCleared" UniqueName="isAlarmCleared" Groupable="False">
                 </telerik:GridCheckBoxColumn>
-                <telerik:GridBoundColumn DataField="EPD_sn"  HeaderText="EPD sn" SortExpression="EPD_sn" UniqueName="EPD_sn" MaxLength="10" ReadOnly="true"/>
-                <telerik:GridBoundColumn DataField="PersID" DataType="System.Int32"  HeaderText="PersID" MaxLength="6" SortExpression="PersID" UniqueName="PersID"  ReadOnly="true" />
-                <telerik:GridBoundColumn DataField="FirstName" HeaderText="First Name" SortExpression="FirstName" UniqueName="FirstName"  ReadOnly="true" />
-                <telerik:GridBoundColumn DataField="LastName" HeaderText="Last Name" SortExpression="LastName" UniqueName="LastName"   ReadOnly="true" />
-                <telerik:GridBoundColumn DataField="alarmStatus" DataType="System.Int32"  HeaderText="Alarm S" SortExpression="alarmStatus" UniqueName="alarmStatus" MaxLength="7" ReadOnly="true" />
-                <telerik:GridBoundColumn DataField="otherAlarms" DataType="System.Int32"  HeaderText="Alarm O" SortExpression="otherAlarms" UniqueName="otherAlarms" MaxLength="7" ReadOnly="true" />
-                <telerik:GridBoundColumn DataField="errorStatus" DataType="System.Int32"  HeaderText="Error S" SortExpression="errorStatus" UniqueName="errorStatus" MaxLength="7" ReadOnly="true" />
-                <telerik:GridBoundColumn DataField="operatingStatus" DataType="System.Int32"  HeaderText="Operate" SortExpression="operatingStatus" UniqueName="operatingStatus" MaxLength="7" ReadOnly="true" />
-                <telerik:GridBoundColumn DataField="InstallationName"  HeaderText="Install." SortExpression="InstallationName" UniqueName="InstallationName" MaxLength="8" ReadOnly="true" />
-                <telerik:GridBoundColumn DataField="Inst_CODE" DataType="System.Int32"  HeaderText="I-" SortExpression="Inst_CODE" UniqueName="Inst_CODE" MaxLength="2" ReadOnly="true" />
-                <telerik:GridBoundColumn DataField="TaskType_CODE" DataType="System.Int32"  HeaderText="Task" SortExpression="TaskType_CODE" UniqueName="TaskType_CODE" MaxLength="5" ReadOnly="true" />
-                <telerik:GridBoundColumn DataField="EntryTime" DataType="System.DateTime"  HeaderText="Entry Time" SortExpression="EntryTime" UniqueName="EntryTime" DataFormatString="{0:yyyy-MM-dd}" ReadOnly="true" />
-                <telerik:GridBoundColumn DataField="ReturnTime" DataType="System.DateTime"  HeaderText="Return Time" SortExpression="ReturnTime" UniqueName="ReturnTime" DataFormatString="{0:yyyy-MM-dd}" ReadOnly="true" />
-                <telerik:GridCheckBoxColumn DataField="isComplete" DataType="System.Boolean"  HeaderText="Complete ?" SortExpression="isComplete" UniqueName="isComplete" ReadOnly="true" />
-                <telerik:GridBoundColumn DataField="Hp10Dose" DataType="System.Double"  HeaderText="Hp10 Dose" SortExpression="Hp10Dose" UniqueName="Hp10Dose" MaxLength="8"  ReadOnly="true" DataFormatString="{0:0.00}" />
-                <telerik:GridBoundColumn DataField="Hp07Dose" DataType="System.Double"  HeaderText="Hp07 Dose" SortExpression="Hp07Dose" UniqueName="Hp07Dose" MaxLength="8"  ReadOnly="true" DataFormatString="{0:0.00}" />
-                <telerik:GridBoundColumn DataField="Hp10Peak" DataType="System.Double"  HeaderText="Hp10 Peak" SortExpression="Hp10Peak" UniqueName="Hp10Peak" MaxLength="8"  ReadOnly="true" DataFormatString="{0:0.00}" />
-                <telerik:GridBoundColumn DataField="Hp07Peak" DataType="System.Double"  HeaderText="Hp07 Peak" SortExpression="Hp07Peak" UniqueName="Hp07Peak" MaxLength="6"  ReadOnly="true" DataFormatString="{0:0.00}" />
-                <telerik:GridBoundColumn DataField="Hp10Time" DataType="System.DateTime"  HeaderText="Hp10 Time" SortExpression="Hp10Time" UniqueName="Hp10Time" MaxLength="6"  ReadOnly="true" DataFormatString="{0:0.00}" />
-                <telerik:GridBoundColumn DataField="Hp07Time" DataType="System.DateTime"  HeaderText="Hp07 Time" SortExpression="Hp07Time" UniqueName="Hp07Time" MaxLength="6"  ReadOnly="true" DataFormatString="{0:0.00}" />
-                <telerik:GridBoundColumn DataField="EPDRad"  HeaderText="EPDRad" SortExpression="EPDRad" UniqueName="EPDRad" MaxLength="6"  ReadOnly="true" />
-                <telerik:GridBoundColumn DataField="D1" DataType="System.Double"  HeaderText="D1" MaxLength="4" SortExpression="D1" UniqueName="D1"  ReadOnly="true" DataFormatString="{0:0.00}" />
-                <telerik:GridBoundColumn DataField="D2" DataType="System.Double"  HeaderText="D2" MaxLength="4" SortExpression="D2" UniqueName="D2"  ReadOnly="true" DataFormatString="{0:0.00}" />
-                <telerik:GridBoundColumn DataField="D3" DataType="System.Double"  HeaderText="D3" MaxLength="4" SortExpression="D3" UniqueName="D3"  ReadOnly="true" DataFormatString="{0:0.00}" />
-                <telerik:GridBoundColumn DataField="D4" DataType="System.Double"  HeaderText="D4" MaxLength="4" SortExpression="D4" UniqueName="D4"  ReadOnly="true" DataFormatString="{0:0.00}" />
+                <telerik:GridBoundColumn DataField="EPD_sn" HeaderText="EPD sn" SortExpression="EPD_sn" UniqueName="EPD_sn" MaxLength="10" ReadOnly="true" />
+                <telerik:GridBoundColumn DataField="PersID" DataType="System.Int32" HeaderText="PersID" MaxLength="6" SortExpression="PersID" UniqueName="PersID" ReadOnly="true" />
+                <telerik:GridBoundColumn DataField="FirstName" HeaderText="First Name" SortExpression="FirstName" UniqueName="FirstName" ReadOnly="true" />
+                <telerik:GridBoundColumn DataField="LastName" HeaderText="Last Name" SortExpression="LastName" UniqueName="LastName" ReadOnly="true" />
+                <telerik:GridBoundColumn DataField="alarmStatus" DataType="System.Int32" HeaderText="Alarm S" SortExpression="alarmStatus" UniqueName="alarmStatus" MaxLength="7" ReadOnly="true" />
+                <telerik:GridBoundColumn DataField="otherAlarms" DataType="System.Int32" HeaderText="Alarm O" SortExpression="otherAlarms" UniqueName="otherAlarms" MaxLength="7" ReadOnly="true" />
+                <telerik:GridBoundColumn DataField="errorStatus" DataType="System.Int32" HeaderText="Error S" SortExpression="errorStatus" UniqueName="errorStatus" MaxLength="7" ReadOnly="true" />
+                <telerik:GridBoundColumn DataField="operatingStatus" DataType="System.Int32" HeaderText="Operate" SortExpression="operatingStatus" UniqueName="operatingStatus" MaxLength="7" ReadOnly="true" />
+                <telerik:GridBoundColumn DataField="InstallationName" HeaderText="Install." SortExpression="InstallationName" UniqueName="InstallationName" MaxLength="8" ReadOnly="true" />
+                <telerik:GridBoundColumn DataField="Inst_CODE" DataType="System.Int32" HeaderText="I-" SortExpression="Inst_CODE" UniqueName="Inst_CODE" MaxLength="2" ReadOnly="true" />
+                <telerik:GridBoundColumn DataField="TaskType_CODE" DataType="System.Int32" HeaderText="Task" SortExpression="TaskType_CODE" UniqueName="TaskType_CODE" MaxLength="5" ReadOnly="true" />
+                <telerik:GridBoundColumn DataField="EntryTime" DataType="System.DateTime" HeaderText="Entry Time" SortExpression="EntryTime" UniqueName="EntryTime" DataFormatString="{0:yyyy-MM-dd}" ReadOnly="true" />
+                <telerik:GridBoundColumn DataField="ReturnTime" DataType="System.DateTime" HeaderText="Return Time" SortExpression="ReturnTime" UniqueName="ReturnTime" DataFormatString="{0:yyyy-MM-dd}" ReadOnly="true" />
+                <telerik:GridCheckBoxColumn DataField="isComplete" DataType="System.Boolean" HeaderText="Complete ?" SortExpression="isComplete" UniqueName="isComplete" ReadOnly="true" />
+                <telerik:GridBoundColumn DataField="Hp10Dose" DataType="System.Double" HeaderText="Hp10 Dose" SortExpression="Hp10Dose" UniqueName="Hp10Dose" MaxLength="8" ReadOnly="true" DataFormatString="{0:0.00}" />
+                <telerik:GridBoundColumn DataField="Hp07Dose" DataType="System.Double" HeaderText="Hp07 Dose" SortExpression="Hp07Dose" UniqueName="Hp07Dose" MaxLength="8" ReadOnly="true" DataFormatString="{0:0.00}" />
+                <telerik:GridBoundColumn DataField="Hp10Peak" DataType="System.Double" HeaderText="Hp10 Peak" SortExpression="Hp10Peak" UniqueName="Hp10Peak" MaxLength="8" ReadOnly="true" DataFormatString="{0:0.00}" />
+                <telerik:GridBoundColumn DataField="Hp07Peak" DataType="System.Double" HeaderText="Hp07 Peak" SortExpression="Hp07Peak" UniqueName="Hp07Peak" MaxLength="6" ReadOnly="true" DataFormatString="{0:0.00}" />
+                <telerik:GridBoundColumn DataField="Hp10Time" DataType="System.DateTime" HeaderText="Hp10 Time" SortExpression="Hp10Time" UniqueName="Hp10Time" MaxLength="6" ReadOnly="true" DataFormatString="{0:0.00}" />
+                <telerik:GridBoundColumn DataField="Hp07Time" DataType="System.DateTime" HeaderText="Hp07 Time" SortExpression="Hp07Time" UniqueName="Hp07Time" MaxLength="6" ReadOnly="true" DataFormatString="{0:0.00}" />
+                <telerik:GridBoundColumn DataField="EPDRad" HeaderText="EPDRad" SortExpression="EPDRad" UniqueName="EPDRad" MaxLength="6" ReadOnly="true" />
+                <telerik:GridBoundColumn DataField="D1" DataType="System.Double" HeaderText="D1" MaxLength="4" SortExpression="D1" UniqueName="D1" ReadOnly="true" DataFormatString="{0:0.00}" />
+                <telerik:GridBoundColumn DataField="D2" DataType="System.Double" HeaderText="D2" MaxLength="4" SortExpression="D2" UniqueName="D2" ReadOnly="true" DataFormatString="{0:0.00}" />
+                <telerik:GridBoundColumn DataField="D3" DataType="System.Double" HeaderText="D3" MaxLength="4" SortExpression="D3" UniqueName="D3" ReadOnly="true" DataFormatString="{0:0.00}" />
+                <telerik:GridBoundColumn DataField="D4" DataType="System.Double" HeaderText="D4" MaxLength="4" SortExpression="D4" UniqueName="D4" ReadOnly="true" DataFormatString="{0:0.00}" />
             </Columns>
             <EditFormSettings EditFormType="Template">
                 <FormTemplate>
                     <table>
                         <tr>
                             <td>
-                          <asp:Label ID="Label111"></asp:Label>
+                                <asp:Label ID="Label111"></asp:Label>
                             </td>
                             <td>
-                                <asp:Label ID="Label13" runat="server" AssociatedControlID="isAlarmClearedCheckBox" Text="I have seen the alarm and I decid to clear it:"></asp:Label>
+                                <asp:Label ID="Label13" runat="server" AssociatedControlID="isAlarmClearedCheckBox" Text="I have seen the alarm and I decide to clear it:"></asp:Label>
                             </td>
                             <td>
                                 <telerik:RadCheckBox ID="isAlarmClearedCheckBox" runat="server" Checked='<%# Bind("isAlarmCleared") %>' Enabled="true" />
                             </td>
-                             <td>
-                        <asp:Label ID="Label122"></asp:Label>
-                            </td>
+                            <td></td>
                         </tr>
                     </table>
                     <div class="rdfCommandButtons">
@@ -78,11 +74,11 @@
         </MasterTableView>
     </telerik:RadGrid>
 
-    <asp:SqlDataSource ID="SqlDSListVistClear" runat="server" ConnectionString="<%$ ConnectionStrings:HPH_REMS_newConnectionString %>"
+    <asp:SqlDataSource ID="SqlDSListVistClear" runat="server" ConnectionString="<%$ ConnectionStrings:eDosConnectionString %>"
         SelectCommand="VisitsToClearSelect" SelectCommandType="StoredProcedure"
-        UpdateCommand="VisitsToClearUpdate" UpdateCommandType="StoredProcedure"
-        >
+        UpdateCommand="VisitsToClearUpdate" UpdateCommandType="StoredProcedure">
         <UpdateParameters>
+            <asp:Parameter Name="ID_Station" Type="Int32" />
             <asp:Parameter Name="ID_Visit" Type="Int32" />
             <asp:Parameter Name="isAlarmCleared" Type="Boolean" />
         </UpdateParameters>
diff --git a/eDos/CommentToInstallation.aspx b/eDos/CommentToInstallation.aspx
index 3c839fd..e3bd8b7 100644
--- a/eDos/CommentToInstallation.aspx
+++ b/eDos/CommentToInstallation.aspx
@@ -93,8 +93,8 @@
                             </td>
                             <td>
                                 <telerik:RadComboBox ID="RadComboBoxSelectAgentSC" runat="server" DataSourceID="SqlDSSelectAgentSC" 
-                                    DataTextField="FullName" 
-                                    DataValueField="PersID" SelectedValue='<%# Bind("PersID") %>' Width="95%">
+                                    DataTextField="displayName" 
+                                    DataValueField="PersID_Resp" SelectedValue='<%# Bind("PersID") %>' Width="95%">
                                 </telerik:RadComboBox>
                             </td>
                         </tr>
@@ -124,7 +124,7 @@
     
 
       <asp:SqlDataSource ID="sqlDSCommentToInstallation" runat="server"
-          ConnectionString="<%$ ConnectionStrings:HPH_REMS_newConnectionString %>"
+          ConnectionString="<%$ ConnectionStrings:eDosConnectionString %>"
           SelectCommand="CommentToInstallationSelect" SelectCommandType="StoredProcedure"
           DeleteCommand="CommentToInstalltionDelete" DeleteCommandType="StoredProcedure"
           InsertCommand="CommentToInstallationInsert" InsertCommandType="StoredProcedure"
@@ -151,7 +151,7 @@
               <asp:Parameter DbType="Date" Name="CommentDateSTOP" />
           </UpdateParameters>
       </asp:SqlDataSource>
-    <asp:SqlDataSource ID="SqlDSSelectInst" runat="server" ConnectionString="<%$ ConnectionStrings:HPH_REMS_newConnectionString %>" SelectCommand="SELECT [Inst_CODE], [InstallationName] FROM [Installation]"></asp:SqlDataSource>
-    <asp:SqlDataSource ID="SqlDSSelectAgentSC" runat="server" ConnectionString="<%$ ConnectionStrings:HPH_REMS_newConnectionString %>" SelectCommand="SELECT [PersID], [LastName], [FirstName], FullName=[LastName]+' '+[FirstName] FROM [V_SelectAGentSCenHPHResp]"></asp:SqlDataSource>
+    <asp:SqlDataSource ID="SqlDSSelectInst" runat="server" ConnectionString="<%$ ConnectionStrings:eDosConnectionString %>" SelectCommand="InstallationsList" SelectCommandType="StoredProcedure"></asp:SqlDataSource>
+    <asp:SqlDataSource ID="SqlDSSelectAgentSC" runat="server" ConnectionString="<%$ ConnectionStrings:eDosConnectionString %>" SelectCommand="AgentList" SelectCommandType="StoredProcedure"></asp:SqlDataSource>
 
 </asp:Content>
diff --git a/eDos/CommentToPerson.aspx b/eDos/CommentToPerson.aspx
index a46b228..1005fea 100644
--- a/eDos/CommentToPerson.aspx
+++ b/eDos/CommentToPerson.aspx
@@ -139,7 +139,7 @@
     </telerik:RadGrid>
 
     <asp:SqlDataSource ID="sqlDSV_CommentToPerson" runat="server"
-        ConnectionString="<%$ ConnectionStrings:HPH_REMS_newConnectionString %>"
+        ConnectionString="<%$ ConnectionStrings:eDosConnectionString %>"
         SelectCommand="CommentToPersonSelect" SelectCommandType="StoredProcedure"
         InsertCommand="CommentToPersonInsert" InsertCommandType="StoredProcedure"
         UpdateCommand="CommentToPersonUpdate" UpdateCommandType="StoredProcedure"
@@ -156,7 +156,7 @@
             <asp:Parameter Name="Comment_EN" Type="String" />
             <asp:Parameter DbType="Date" Name="CommentDate" />
             <asp:Parameter Name="CommentDateApply" DbType="Date" />
-            <asp:Parameter Name="NumberOfTimeToDisplay" Type="Int32" />
+            <asp:Parameter Name="NumberOfTimeToDisplay" Type="Int32" DefaultValue="3" />
         </InsertParameters>
         <UpdateParameters>
             <asp:Parameter Name="ID_CommentToPerson" Type="Int32" />
@@ -172,8 +172,8 @@
 
     </asp:SqlDataSource>
 
-    <asp:SqlDataSource ID="SqlDSSelectPerson" runat="server" ConnectionString="<%$ ConnectionStrings:HPH_REMS_newConnectionString %>" SelectCommand="PersonList" SelectCommandType="StoredProcedure"></asp:SqlDataSource>
-    <asp:SqlDataSource ID="SqlDSSelectAgentSC" runat="server" ConnectionString="<%$ ConnectionStrings:HPH_REMS_newConnectionString %>" SelectCommand="SELECT [PersID], displayName=[LastName]+' '+[FirstName] FROM [V_SelectAGentSCenHPHResp]"></asp:SqlDataSource>
+    <asp:SqlDataSource ID="SqlDSSelectPerson" runat="server" ConnectionString="<%$ ConnectionStrings:eDosConnectionString %>" SelectCommand="PersonList" SelectCommandType="StoredProcedure"></asp:SqlDataSource>
+    <asp:SqlDataSource ID="SqlDSSelectAgentSC" runat="server" ConnectionString="<%$ ConnectionStrings:eDosConnectionString %>" SelectCommand="AgentHPHList" SelectCommandType="StoredProcedure"></asp:SqlDataSource>
 
 
 
diff --git a/eDos/DocD.aspx b/eDos/DocD.aspx
index 80bb5a4..e66b322 100644
--- a/eDos/DocD.aspx
+++ b/eDos/DocD.aspx
@@ -98,7 +98,7 @@
     </telerik:RadGrid>
 
     <asp:SqlDataSource ID="sqlDSV_DoseDocD" runat="server"
-        ConnectionString="<%$ ConnectionStrings:HPH_REMS_newConnectionString %>"
+        ConnectionString="<%$ ConnectionStrings:eDosConnectionString %>"
         SelectCommand="Dose_DocDSelect" SelectCommandType="StoredProcedure"
         InsertCommand="Dose_DocDInsert" InsertCommandType="StoredProcedure"
         UpdateCommand="Dose_DocDUpdate" UpdateCommandType="StoredProcedure"
@@ -123,8 +123,8 @@
 
     </asp:SqlDataSource>
 
-    <asp:SqlDataSource ID="SqlDSSelectPerson" runat="server" ConnectionString="<%$ ConnectionStrings:HPH_REMS_newConnectionString %>" SelectCommand="PersonList" SelectCommandType="StoredProcedure"></asp:SqlDataSource>
-    <asp:SqlDataSource ID="SqlDSSelectAgentSC" runat="server" ConnectionString="<%$ ConnectionStrings:HPH_REMS_newConnectionString %>" SelectCommand="SELECT [PersID], displayName=[LastName]+' '+[FirstName] FROM [V_SelectAGentSCenHPHResp]"></asp:SqlDataSource>
+    <asp:SqlDataSource ID="SqlDSSelectPerson" runat="server" ConnectionString="<%$ ConnectionStrings:eDosConnectionString %>" SelectCommand="PersonList" SelectCommandType="StoredProcedure"></asp:SqlDataSource>
+    <asp:SqlDataSource ID="SqlDSSelectAgentSC" runat="server" ConnectionString="<%$ ConnectionStrings:eDosConnectionString %>" SelectCommand="AgentHPHList" SelectCommandType="StoredProcedure"> </asp:SqlDataSource>
 
 
 </asp:Content>
diff --git a/eDos/DocD.aspx.designer.cs b/eDos/DocD.aspx.designer.cs
index 51974c2..737627e 100644
--- a/eDos/DocD.aspx.designer.cs
+++ b/eDos/DocD.aspx.designer.cs
@@ -21,96 +21,6 @@ namespace Rems2018 {
         /// </remarks>
         protected global::Telerik.Web.UI.RadGrid RadGrid1;
         
-        /// <summary>
-        /// Label3 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Label Label3;
-        
-        /// <summary>
-        /// RadComboBoxSelectPerson control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::Telerik.Web.UI.RadComboBox RadComboBoxSelectPerson;
-        
-        /// <summary>
-        /// Label9 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Label Label9;
-        
-        /// <summary>
-        /// Date_Dose control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::Telerik.Web.UI.RadDatePicker Date_Dose;
-        
-        /// <summary>
-        /// Label5 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Label Label5;
-        
-        /// <summary>
-        /// Dose_52W_microSv control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.TextBox Dose_52W_microSv;
-        
-        /// <summary>
-        /// Label7 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.Label Label7;
-        
-        /// <summary>
-        /// RadComboBoxSelectAgentSC control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::Telerik.Web.UI.RadComboBox RadComboBoxSelectAgentSC;
-        
-        /// <summary>
-        /// UpdateButton control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::Telerik.Web.UI.RadButton UpdateButton;
-        
-        /// <summary>
-        /// CancelButton control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::Telerik.Web.UI.RadButton CancelButton;
-        
         /// <summary>
         /// sqlDSV_DoseDocD control.
         /// </summary>
diff --git a/eDos/EPD.aspx b/eDos/EPD.aspx
index 5a18669..85cf615 100644
--- a/eDos/EPD.aspx
+++ b/eDos/EPD.aspx
@@ -43,7 +43,7 @@
     </MasterTableView>
 </telerik:RadGrid>
 <asp:SqlDataSource ID="sqlDSEPD" runat="server" 
-    ConnectionString="<%$ ConnectionStrings:HPH_REMS_newConnectionString %>" 
-        SelectCommand="SELECT [ID_EPD], [EPDType], [EPD_sn], [EPDstatus], [EPDNextCalibrationDate], [LokalToestellen], [InstallationName], [LastUsedEntry], [LastUsedExit], [EPD_InternalID], [EPDTypeDescription], [EPDRad], [LastInstallation] FROM [V_EPD]">
+    ConnectionString="<%$ ConnectionStrings:eDosConnectionString %>" 
+        SelectCommand="EPDSelect" SelectCommandType="StoredProcedure">
 </asp:SqlDataSource>
 </asp:Content>
diff --git a/eDos/FNGainANGain.aspx b/eDos/FNGainANGain.aspx
index b794769..ccfb6a9 100644
--- a/eDos/FNGainANGain.aspx
+++ b/eDos/FNGainANGain.aspx
@@ -1,12 +1,12 @@
-<%@ Page Title="" Language="C#" MasterPageFile="~/Site.master" AutoEventWireup="true" 
+<%@ Page Title="" Language="C#" MasterPageFile="~/Site.master" AutoEventWireup="true"
     CodeBehind="FNGainANGain.aspx.cs" Inherits="Rems2018.FNGainANGain" %>
 
 <asp:Content ID="Content1" ContentPlaceHolderID="head" runat="server">
 </asp:Content>
 <asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder1" runat="server">
-    <telerik:RadGrid ID="RadGrid2" runat="server" 
-        AllowAutomaticInserts="True" AllowAutomaticUpdates="True" 
-        CellSpacing="-1" GridLines="Both" AllowPaging="True"  
+    <telerik:RadGrid ID="RadGrid2" runat="server"
+        AllowAutomaticInserts="True" AllowAutomaticUpdates="True"
+        CellSpacing="-1" GridLines="Both" AllowPaging="True"
         DataSourceID="sqlDSFNGainANGain"
         AutoGenerateColumns="False">
         <GroupingSettings CollapseAllTooltip="Collapse all groups"></GroupingSettings>
@@ -15,24 +15,23 @@
             <Csv ColumnDelimiter="Semicolon" />
         </ExportSettings>
         <ClientSettings>
-            <Scrolling AllowScroll="True" UseStaticHeaders="True" ScrollHeight="700px"  />
+            <Scrolling AllowScroll="True" UseStaticHeaders="True" ScrollHeight="700px" />
         </ClientSettings>
-        <MasterTableView DataKeyNames="ID_FNGAinANGain" CommandItemDisplay="TopAndBottom" DataSourceID="sqlDSFNGainANGain" >
+        <MasterTableView DataKeyNames="ID_FNGAinANGain" CommandItemDisplay="TopAndBottom" DataSourceID="sqlDSFNGainANGain">
             <CommandItemSettings ShowExportToExcelButton="True" ShowAddNewRecordButton="False" />
             <Columns>
-         
-                <telerik:GridBoundColumn DataField="FNGain_ANGainValue" FilterControlAltText="Filter FNGain_ANGainValue column" HeaderText="FNGain and ANGain Value" SortExpression="FNGain_ANGainValue" UniqueName="FNGain_ANGainValue" DataType="System.Double">
+                <telerik:GridBoundColumn DataField="ID_FNGAinANGain" FilterControlAltText="Filter ID_FNGAinANGain column" HeaderText="ID" SortExpression="ID_FNGAinANGain" UniqueName="ID_FNGAinANGain" DataType="System.Int32" ReadOnly="True">
+                </telerik:GridBoundColumn>
+                <telerik:GridBoundColumn DataField="FNGain_ANGainValue" FilterControlAltText="Filter FNGain_ANGainValue column" HeaderText="FNGain and ANGain Value" SortExpression="FNGain_ANGainValue" UniqueName="FNGain_ANGainValue" DataType="System.Double" DataFormatString="{0:0.00}"  >
                 </telerik:GridBoundColumn>
                 <telerik:GridBoundColumn DataField="InstallationActivity" FilterControlAltText="Filter InstallationActivity column" HeaderText="Installation and/or Activity" SortExpression="InstallationActivity" UniqueName="InstallationActivity">
                 </telerik:GridBoundColumn>
                 <telerik:GridBoundColumn DataField="Description" FilterControlAltText="Filter Description column" HeaderText="Description" SortExpression="Description" UniqueName="Description">
                 </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="ID_FNGAinANGain" FilterControlAltText="Filter ID_FNGAinANGain column" HeaderText="ID_FNGAinANGain" SortExpression="ID_FNGAinANGain" UniqueName="ID_FNGAinANGain" DataType="System.Int32" ReadOnly="True">
-                </telerik:GridBoundColumn>
             </Columns>
         </MasterTableView>
     </telerik:RadGrid>
     <asp:SqlDataSource ID="sqlDSFNGainANGain" runat="server"
-        ConnectionString="<%$ ConnectionStrings:HPH_REMS_newConnectionString %>"
-        SelectCommand="SELECT [FNGain_ANGainValue], [InstallationActivity], [Description], [ID_FNGAinANGain] FROM [FNGainANGain] ORDER BY [InstallationActivity]"></asp:SqlDataSource>
+        ConnectionString="<%$ ConnectionStrings:eDosConnectionString %>"
+        SelectCommand="FNGainselect" SelectCommandType="StoredProcedure"></asp:SqlDataSource>
 </asp:Content>
diff --git a/eDos/LimitPerson.aspx b/eDos/LimitPerson.aspx
index 6ec1bb2..c5a4768 100644
--- a/eDos/LimitPerson.aspx
+++ b/eDos/LimitPerson.aspx
@@ -28,14 +28,12 @@
             </telerik:GridBoundColumn>
             <telerik:GridCheckBoxColumn DataField="AccessAllow" DataType="System.Boolean" HeaderText="AccessAllow" UniqueName="AccessAllow">
             </telerik:GridCheckBoxColumn>
-           
-          
         </Columns>
     </MasterTableView>
 </telerik:RadGrid>
   
 <asp:SqlDataSource ID="sqlDSLimitPerson" runat="server" 
-    ConnectionString="<%$ ConnectionStrings:HPH_REMS_newConnectionString %>" 
-        SelectCommand="SELECT [ConCode], [YearToDateLimit], [QuarterLimit], [MonthlyLimit], [AccessAllow] FROM [LimitPerson]">
+    ConnectionString="<%$ ConnectionStrings:eDosConnectionString %>" 
+        SelectCommand="LimitPersonSelect" SelectCommandType="StoredProcedure">
 </asp:SqlDataSource>
 </asp:Content>
diff --git a/eDos/ManualReturn.aspx b/eDos/ManualReturn.aspx
index a578c53..4e668fe 100644
--- a/eDos/ManualReturn.aspx
+++ b/eDos/ManualReturn.aspx
@@ -14,15 +14,14 @@
         <ClientSettings AllowColumnsReorder="True">
             <Scrolling AllowScroll="True" UseStaticHeaders="True" />
         </ClientSettings>
-        <MasterTableView DataKeyNames="ID_Visit" CommandItemDisplay="Top" DataSourceID="SqlDSManualReturn" EditMode="EditForms">
+        <MasterTableView DataKeyNames="ID_Station,ID_Visit" CommandItemDisplay="Top" DataSourceID="SqlDSManualReturn" EditMode="EditForms">
             <CommandItemSettings ShowExportToExcelButton="True" ShowAddNewRecordButton="False" />
             <Columns>
                  <telerik:GridButtonColumn CommandName="Edit" Text="Edit" ButtonCssClass="rgEdit" UniqueName="EditColumn" HeaderStyle-Width="30px">
                             <HeaderStyle Width="30px"></HeaderStyle>
                         </telerik:GridButtonColumn>
-                <telerik:GridBoundColumn DataField="ID_Visit" DataType="System.Int32"  HeaderText="ID_Visit" ReadOnly="True" SortExpression="ID_Visit" UniqueName="ID_Visit">
-                </telerik:GridBoundColumn>
-
+                <telerik:GridBoundColumn DataField="ID_Station" DataType="System.Int32"  HeaderText="Station" ReadOnly="True" SortExpression="ID_Station" UniqueName="ID_Station"/>
+                <telerik:GridBoundColumn DataField="ID_Visit" DataType="System.Int32"  HeaderText="Visit" ReadOnly="True" SortExpression="ID_Visit" UniqueName="ID_Visit"/>
                 <telerik:GridBoundColumn DataField="PersID"  HeaderText="PersID" SortExpression="PersID" UniqueName="PersID" DataType="System.Int32">
                 </telerik:GridBoundColumn>
 
@@ -168,10 +167,11 @@
     </telerik:RadGrid>
 
     <asp:SqlDataSource ID="SqlDSManualReturn" runat="server"
-        ConnectionString="<%$ ConnectionStrings:HPH_REMS_newConnectionString %>"
+        ConnectionString="<%$ ConnectionStrings:eDosConnectionString %>"
         SelectCommand="ManualReturnSelect" SelectCommandType="StoredProcedure"
         UpdateCommand="ManualReturnUpdate" UpdateCommandType="StoredProcedure">
         <UpdateParameters>
+            <asp:Parameter Name="ID_Station" Type="Int32" />
             <asp:Parameter Name="ID_Visit" Type="Int32" />
             <asp:Parameter Name="Inst_CODE" Type="Int32" />
             <asp:Parameter DbType="Date" Name="ReturnTime" />
@@ -182,10 +182,9 @@
             <asp:Parameter DbType="Date" Name="Hp10Time" />
             <asp:Parameter DbType="Date" Name="Hp07Time" />
             <asp:Parameter Name="isManualExit" Type="Boolean" />
-
         </UpdateParameters>
     </asp:SqlDataSource>
 
-    <asp:SqlDataSource ID="SqlDSSelectInst" runat="server" ConnectionString="<%$ ConnectionStrings:HPH_REMS_newConnectionString %>" SelectCommand="SELECT [Inst_CODE], [InstallationName] FROM [Installation]"></asp:SqlDataSource>
+    <asp:SqlDataSource ID="SqlDSSelectInst" runat="server" ConnectionString="<%$ ConnectionStrings:eDosConnectionString %>" SelectCommand="InstallationsList" SelectCommandType="StoredProcedure"></asp:SqlDataSource>
 
 </asp:Content>
diff --git a/eDos/Site.master b/eDos/Site.master
index 4bda677..9bed09d 100644
--- a/eDos/Site.master
+++ b/eDos/Site.master
@@ -5,7 +5,7 @@
     <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <link href="favicon.ico" rel="shortcut icon" type="image/x-icon" />
-    <title>REMS 2018</title>
+    <title>eDos</title>
     <link href="rems.css" rel="stylesheet" />
             <%--<telerik:RadStyleSheetManager ID="eDoseStyleSheetManager" runat="server" >
             <StyleSheets>
diff --git a/eDos/TaskBG.aspx b/eDos/TaskBG.aspx
index 7d7e26f..365b7e4 100644
--- a/eDos/TaskBG.aspx
+++ b/eDos/TaskBG.aspx
@@ -131,7 +131,7 @@
 
 
     <asp:SqlDataSource ID="sqlDSV_Task" runat="server"
-        ConnectionString="<%$ ConnectionStrings:HPH_REMS_newConnectionString %>"
+        ConnectionString="<%$ ConnectionStrings:eDosConnectionString %>"
         SelectCommand="TaskBGSelect" SelectCommandType="StoredProcedure"
         InsertCommand="TaskBGInsert" InsertCommandType="StoredProcedure"
         UpdateCommand="TaskBGUpdate" UpdateCommandType="StoredProcedure">
@@ -161,9 +161,13 @@
     </asp:SqlDataSource>
 
 
-    <asp:SqlDataSource ID="SqlDSSelectInst" runat="server" ConnectionString="<%$ ConnectionStrings:HPH_REMS_newConnectionString %>" SelectCommand="SELECT [Inst_CODE], [InstallationName] FROM [Installation] order by InstallationName"></asp:SqlDataSource>
-    <asp:SqlDataSource ID="SqlDSSelectAlarmLevel" runat="server" ConnectionString="<%$ ConnectionStrings:HPH_REMS_newConnectionString %>"
-        SelectCommand="SELECT [ID_AlarmEPD], [AlarmEPDName], [EPDRad] FROM [AlarmEPD] where epdrad='BG';"></asp:SqlDataSource>
+    <asp:SqlDataSource ID="SqlDSSelectInst" runat="server" ConnectionString="<%$ ConnectionStrings:eDosConnectionString %>" SelectCommand="installationsList" SelectCommandType="StoredProcedure"></asp:SqlDataSource>
+    <asp:SqlDataSource ID="SqlDSSelectAlarmLevel" runat="server" ConnectionString="<%$ ConnectionStrings:eDosConnectionString %>"
+        SelectCommand="AlarmEPDList" SelectCommandType="StoredProcedure">
+        <SelectParameters>
+            <asp:Parameter DefaultValue="BG" Name="epdrad" Type="String" />
+        </SelectParameters>
+    </asp:SqlDataSource>
 
 
 </asp:Content>
diff --git a/eDos/TaskNG.aspx b/eDos/TaskNG.aspx
index 55043a3..39356be 100644
--- a/eDos/TaskNG.aspx
+++ b/eDos/TaskNG.aspx
@@ -66,7 +66,7 @@
                         </tr>
                         <tr>
                             <td style="font-weight: bold">
-                                <asp:Label ID="Label14" runat="server" AssociatedControlID="TaskEnableCheckBox" CssClass="rdfLabel rdfBlock" Text="Actif"></asp:Label>
+                                <asp:Label ID="Label14" runat="server" AssociatedControlID="TaskEnableCheckBox" CssClass="rdfLabel rdfBlock" Text="Active"></asp:Label>
                             </td>
                             <td>
                                 <telerik:RadCheckBox ID="TaskEnableCheckBox" runat="server" Checked='<%# Bind("TaskEnable") %>' />
@@ -112,7 +112,7 @@
                                 <asp:Label ID="Label22" runat="server" CssClass="rdfLabel rdfBlock" Text="Alarm EPD Level: "></asp:Label>
                             </td>
                             <td>
-                                <telerik:RadComboBox ID="RadComboBoxSelectAlarmLevel" runat="server" DataTextField="AlarmEPDName" DataValueField="ID_AlarmEPD" Width="95%" SelectedValue='<%# Bind("ID_AlarmEPD") %>' OnLoad="RadComboBoxSelectAlarmLevel_Load" />
+                                <telerik:RadComboBox ID="RadComboBoxSelectAlarmLevel" runat="server" DataSourceID="SqlDSSelectAlarmLevel" DataTextField="AlarmEPDName" DataValueField="ID_AlarmEPD" Width="95%" SelectedValue='<%# Bind("ID_AlarmEPD") %>'  />
                             </td>
                         </tr>
                         <tr>
@@ -120,7 +120,7 @@
                                 <asp:Label ID="Label23" runat="server" CssClass="rdfLabel rdfBlock" Text="FNGainANGain: "></asp:Label>
                             </td>
                             <td>
-                                <telerik:RadComboBox ID="RadComboBox4" runat="server" DataSourceID="SqlDSSelectGain" DataTextField="InstallationActivity" DataValueField="ID_FNGainANGain" Width="95%" SelectedValue='<%# Bind("ID_FNGainANGain") %>' />
+                                <telerik:RadComboBox ID="RadComboBox4" runat="server" DataSourceID="SqlDSSelectGain" DataTextField="InstallationActivity" DataValueField="ID_FNGAinANGain" Width="95%" SelectedValue='<%# Bind("ID_FNGainANGain") %>' />
                             </td>
                         </tr>
                     </table>
@@ -138,7 +138,7 @@
 
 
     <asp:SqlDataSource ID="sqlDSV_Task" runat="server"
-        ConnectionString="<%$ ConnectionStrings:HPH_REMS_newConnectionString %>"
+        ConnectionString="<%$ ConnectionStrings:eDosConnectionString %>"
         SelectCommand="TaskNGSelect" SelectCommandType="StoredProcedure"
         InsertCommand="TaskNGInsert" InsertCommandType="StoredProcedure"
         UpdateCommand="TaskNGUpdate" UpdateCommandType="StoredProcedure">
@@ -169,11 +169,14 @@
     </asp:SqlDataSource>
 
 
-    <asp:SqlDataSource ID="SqlDSSelectInst" runat="server" ConnectionString="<%$ ConnectionStrings:HPH_REMS_newConnectionString %>" SelectCommand="SELECT [Inst_CODE], [InstallationName] FROM [Installation] order by [InstallationName]"></asp:SqlDataSource>
-    <asp:SqlDataSource ID="SqlDSSelectAlarmLevel" runat="server" ConnectionString="<%$ ConnectionStrings:HPH_REMS_newConnectionString %>"
-        SelectCommand="SELECT [ID_AlarmEPD], [AlarmEPDName], [EPDRad] FROM [AlarmEPD] where epdrad='NG';">
+    <asp:SqlDataSource ID="SqlDSSelectInst" runat="server" ConnectionString="<%$ ConnectionStrings:eDosConnectionString %>" SelectCommand="InstallationsList" SelectCommandType="StoredProcedure"></asp:SqlDataSource>
+    <asp:SqlDataSource ID="SqlDSSelectAlarmLevel" runat="server" ConnectionString="<%$ ConnectionStrings:eDosConnectionString %>"
+        SelectCommand="AlarmEPDList" SelectCommandType="StoredProcedure">
+        <SelectParameters>
+            <asp:Parameter DefaultValue="NG" Name="epdrad" Type="String" />
+        </SelectParameters>
     </asp:SqlDataSource>
 
-    <asp:SqlDataSource ID="SqlDSSelectGain" runat="server" ConnectionString="<%$ ConnectionStrings:HPH_REMS_newConnectionString %>" SelectCommand="SELECT [ID_FNGainANGain],[FNGain_ANGainValue]
-      ,[InstallationActivity],[Description] FROM [FNGAinANGain]"></asp:SqlDataSource>
+    <asp:SqlDataSource ID="SqlDSSelectGain" runat="server" ConnectionString="<%$ ConnectionStrings:eDosConnectionString %>" 
+        SelectCommand="fngainselect" SelectCommandType="StoredProcedure"></asp:SqlDataSource>
 </asp:Content>
diff --git a/eDos/TaskTypeStandard.aspx b/eDos/TaskTypeStandard.aspx
index 668d091..3c33993 100644
--- a/eDos/TaskTypeStandard.aspx
+++ b/eDos/TaskTypeStandard.aspx
@@ -29,6 +29,6 @@
         </MasterTableView>
     </telerik:RadGrid>
     <asp:SqlDataSource ID="sqlDSTaskTypeStandard" runat="server"
-        ConnectionString="<%$ ConnectionStrings:HPH_REMS_newConnectionString %>"
-        SelectCommand="SELECT [TaskTypeStandard_CODE], [TaskType_Name] FROM [TaskTypeStandard] ORDER BY [TaskTypeStandard_CODE]"></asp:SqlDataSource>
+        ConnectionString="<%$ ConnectionStrings:eDosConnectionString %>"
+        SelectCommand="TaskTypeStandardSelect" SelectCommandType="StoredProcedure"></asp:SqlDataSource>
 </asp:Content>
diff --git a/eDos/WSumDose.aspx b/eDos/WSumDose.aspx
index aa55485..b4aa460 100644
--- a/eDos/WSumDose.aspx
+++ b/eDos/WSumDose.aspx
@@ -54,7 +54,7 @@
 </telerik:RadGrid>
   
 <asp:SqlDataSource ID="sqlDSWSumDose" runat="server" 
-    ConnectionString="<%$ ConnectionStrings:HPH_REMS_newConnectionString %>" 
-        SelectCommand="SELECT [SUMHp10Dose_Y], [SUMHp07Dose_Y], [TOTSUM_Y], [YearToDateLimit], [SUMHp10Dose_Q], [SUMHp07Dose_Q], [TOTSUM_Q], [QuarterLimit], [SUMHp10Dose_M], [SUMHp07Dose_M], [TOTSUM_M], [MonthlyLimit], [Margin], [Type], [PersID] FROM [V_SumDosePerson]">
+    ConnectionString="<%$ ConnectionStrings:eDosConnectionString %>" 
+        SelectCommand="SumDosePersonSelect" SelectCommandType="StoredProcedure">
 </asp:SqlDataSource>
 </asp:Content>
diff --git a/eDos/Worker.aspx b/eDos/Worker.aspx
index 1f8e210..d5640f0 100644
--- a/eDos/Worker.aspx
+++ b/eDos/Worker.aspx
@@ -4,7 +4,7 @@
 </asp:Content>
 <asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder1" runat="server">
 
-    <telerik:RadComboBox ID="cmbPerson" runat="server" DataSourceID="sqlDSPerson" DataTextField="Name" DataValueField="PersID" MarkFirstMatch="True" OnSelectedIndexChanged="cmbPerson_SelectedIndexChanged" OnDataBound="cmbPerson_DataBound" AutoPostBack="true" Width="208px">
+    <telerik:RadComboBox ID="cmbPerson" runat="server" DataSourceID="sqlDSPerson" DataTextField="displayName" DataValueField="PersID" MarkFirstMatch="True" OnSelectedIndexChanged="cmbPerson_SelectedIndexChanged" OnDataBound="cmbPerson_DataBound" AutoPostBack="true" Width="208px">
     </telerik:RadComboBox>
     <br />
     <telerik:RadDataForm ID="RadDataForm1" runat="server" DataSourceID="sqlDsView" CssClass="rdfInlineBlock" DataKeyNames="PersID" RenderMode="Lightweight" OnNeedDataSource="RadDataForm1_NeedDataSource">
@@ -78,47 +78,47 @@
                     </tr>
 
                     <tr>
-                         <td style="color: darkblue; font-weight: bold; text-decoration: underline; font-size:20px">
-                                              <asp:Label ID="Label22" runat="server" Text="Access allowed to controlled area ?"></asp:Label>
+                        <td style="color: darkblue; font-weight: bold; text-decoration: underline; font-size: 20px">
+                            <asp:Label ID="Label22" runat="server" Text="Access allowed to controlled area ?"></asp:Label>
                         </td>
-                     </tr>
+                    </tr>
 
-                     <tr>
-                        <td style="color: darkblue; font-weight: bold; font-family:Arial;"; >
+                    <tr>
+                        <td style="color: darkblue; font-weight: bold; font-family: Arial;">
                             <asp:Label ID="Label21" runat="server" Text="1. Check in the folder 'Limit' below that the Margin is high enough for the 'Min. margin for the task'. If that is not the case you can add some Limits. Go to Alarm/Add limit."></asp:Label>
                         </td>
-                       
+
                     </tr>
-                     <tr>
+                    <tr>
                         <td style="color: darkblue; font-weight: bold">
                             <asp:Label ID="Label23" runat="server" CssClass="rdfLabel rdfBlock" Text="2. Check in the 'General Informations' that the Code at the medical Service is not D1. If that is the case that person is not allow to access the Controlled area for medical reason."></asp:Label>
                         </td>
-                       
+
                     </tr>
                     <tr>
                         <td style="color: darkblue; font-weight: bold">
                             <asp:Label ID="Label18" runat="server" CssClass="rdfLabel rdfBlock" Text="3. Check if a Visit needs to be cleared (alarm on the EPD during the visit). Last ID visit to clear:"></asp:Label>
                         </td>
                         <td style="color: darkblue; font-weight: bold">
-                            <asp:Label ID="Label19" runat="server" CssClass="rdfFieldValue" Text='<%# Eval("VisitIDLocked") %>' />
+                            <asp:Label ID="Label19" runat="server" CssClass="rdfFieldValue" Text='<%# Eval("StationVisitIDLocked") %>' />
                         </td>
                     </tr>
-                    
+
                     <tr>
                         <td style="color: darkblue">
                             <asp:Label ID="Label20" runat="server" CssClass="rdfLabel rdfBlock" Text="(To clear it go to Worker/Clear Visit Alarm and select the person. Clear all the alarm for that person)"></asp:Label>
                         </td>
-                       
+
                     </tr>
                     <tr>
                         <td style="color: darkblue; font-weight: bold">
-                            <asp:Label style="color: darkblue;" ID="Label13" runat="server" AssociatedControlID="AccessAllowCheckBox" CssClass="rdfLabel rdfBlock" Text="4. Check that the Quiz, WBC, Medical.. are in orde ? If that is not the case you can give access for today via the button bellow."></asp:Label>
+                            <asp:Label Style="color: darkblue;" ID="Label13" runat="server" AssociatedControlID="AccessAllowCheckBox" CssClass="rdfLabel rdfBlock" Text="4. Check that the Quiz, WBC, Medical.. are in orde ? If that is not the case you can give access for today via the button bellow."></asp:Label>
                         </td>
                         <td style="color: darkblue; font-weight: bold">
                             <asp:CheckBox ID="AccessAllowCheckBox" runat="server" Enabled="false" Checked='<%# Eval("AccessAllow") %>' />
                         </td>
                     </tr>
-      
+
                 </table>
 
                 <div class="rdfCommandButtons">
@@ -175,9 +175,9 @@
                     </div>
                 </LayoutTemplate>
                 <ItemTemplate>
-                         <tr style="font-weight: bold">
-                                    <asp:Label ID="Label28" runat="server" CssClass="rdfLabel rdfBlock" Text="Doses at SCK:"></asp:Label>
-                                </tr>
+                    <tr style="font-weight: bold">
+                        <asp:Label ID="Label28" runat="server" CssClass="rdfLabel rdfBlock" Text="Doses at SCK:"></asp:Label>
+                    </tr>
                     <fieldset class="rdfFieldset rdfBorders">
                         <table style="width: 100%;">
                             <tr>
@@ -303,7 +303,7 @@
             </telerik:RadDataForm>
         </telerik:RadPageView>
         <telerik:RadPageView runat="server" ID="pVisits" TabIndex="1">
-            <telerik:RadGrid runat="server" ID="gridVisits" DataSourceID="sqlDSVisitPersId" CellSpacing="-1" GridLines="Both" AllowFilteringByColumn="True" AutoGenerateColumns="False"  AllowSorting="True"  AutoGenerateHierarchy="True" EnableHeaderContextAggregatesMenu="True" EnableHeaderContextFilterMenu="True" EnableHeaderContextMenu="True" OnNeedDataSource="gridVisits_NeedDataSource">
+            <telerik:RadGrid runat="server" ID="gridVisits" DataSourceID="sqlDSVisitPersId" CellSpacing="-1" GridLines="Both" AllowFilteringByColumn="True" AutoGenerateColumns="False" AllowSorting="True" AutoGenerateHierarchy="True" EnableHeaderContextAggregatesMenu="True" EnableHeaderContextFilterMenu="True" EnableHeaderContextMenu="True" OnNeedDataSource="gridVisits_NeedDataSource">
 
                 <GroupingSettings CollapseAllTooltip="Collapse all groups"></GroupingSettings>
 
@@ -355,23 +355,21 @@
                         </telerik:GridCheckBoxColumn>
                         <telerik:GridCheckBoxColumn DataField="isComplete" DataType="System.Boolean" FilterControlAltText="Filter isComplete column" HeaderText="isComplete" SortExpression="isComplete" UniqueName="isComplete">
                         </telerik:GridCheckBoxColumn>
-
                     </Columns>
                 </MasterTableView>
-
             </telerik:RadGrid>
         </telerik:RadPageView>
     </telerik:RadMultiPage>
-    
+
     <asp:SqlDataSource ID="getPersonLimit" runat="server"
-        ConnectionString="<%$ ConnectionStrings:HPH_REMS_newConnectionString %>"
-        SelectCommand="SELECT PersID, YearToDateLimit, ConCode, MonthlyLimit, QuarterLimit, AccessAllow, SUMHp10Dose_Y_2deci, SUMHp07Dose_Y_2deci, SUMHpNDose_Y_2deci, SUMHp10Dose_Q_2deci, SUMHp07Dose_Q_2deci, SUMHpNDose_Q_2deci, SUMHp10Dose_M_2deci, SUMHp07Dose_M_2deci, SUMHpNDose_M_2deci, MarginHP10_M_2deci, MarginHP10_Y_2deci, MarginHP10_Q_2deci, MaxAddLimY, MaxAddLimQ, MaxAddLimM,LastDate,Dose_52W_microSv FROM V_SumDosePersonLimit_2deci where PersID=@PersID">
+        ConnectionString="<%$ ConnectionStrings:eDosConnectionString %>"
+        SelectCommand="PersonLimitSelect" SelectCommandType="StoredProcedure">
         <SelectParameters>
             <asp:ControlParameter ControlID="cmbPerson" Name="PersID" PropertyName="SelectedValue" />
         </SelectParameters>
     </asp:SqlDataSource>
 
-    <asp:SqlDataSource ID="sqlDsView" runat="server" ConnectionString="<%$ ConnectionStrings:HPH_REMS_newConnectionString %>"
+    <asp:SqlDataSource ID="sqlDsView" runat="server" ConnectionString="<%$ ConnectionStrings:eDosConnectionString %>"
         SelectCommand="PersonSelect" SelectCommandType="StoredProcedure"
         UpdateCommand="PersonUpdate" UpdateCommandType="StoredProcedure">
         <SelectParameters>
@@ -384,12 +382,13 @@
     </asp:SqlDataSource>
 
     <asp:SqlDataSource ID="sqlDSPerson" runat="server"
-        ConnectionString="<%$ ConnectionStrings:HPH_REMS_newConnectionString %>"
-        SelectCommand="SELECT [PersID], Name= [LastName]+' '+[FirstName] FROM [Person]"></asp:SqlDataSource>
+        ConnectionString="<%$ ConnectionStrings:eDosConnectionString %>"
+        SelectCommand="PersonList" SelectCommandType="StoredProcedure"></asp:SqlDataSource>
 
-    <asp:SqlDataSource ID="sqlDSVisitPersId" runat="server" ConnectionString="<%$ ConnectionStrings:HPH_REMS_newConnectionString %>"
+    <asp:SqlDataSource ID="sqlDSVisitPersId" runat="server" ConnectionString="<%$ ConnectionStrings:eDosConnectionString %>"
         SelectCommand="VisitPersIDSelect" SelectCommandType="StoredProcedure">
         <SelectParameters>
             <asp:ControlParameter ControlID="cmbPerson" Name="PersID" PropertyName="SelectedValue" Type="Int32" />
-        </SelectParameters></asp:SqlDataSource>
+        </SelectParameters>
+    </asp:SqlDataSource>
 </asp:Content>
diff --git a/eDos/eDos.csproj b/eDos/eDos.csproj
index 05aa2ea..9c885f8 100644
--- a/eDos/eDos.csproj
+++ b/eDos/eDos.csproj
@@ -166,6 +166,13 @@
     <Compile Include="LimitPerson.aspx.designer.cs">
       <DependentUpon>LimitPerson.aspx</DependentUpon>
     </Compile>
+    <Compile Include="test.aspx.cs">
+      <DependentUpon>test.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="test.aspx.designer.cs">
+      <DependentUpon>test.aspx</DependentUpon>
+    </Compile>
     <Compile Include="WSumDose.aspx.cs">
       <DependentUpon>WSumDose.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -210,6 +217,7 @@
     <Content Include="ClearVisitAlarm.aspx" />
     <Content Include="CommentToPerson.aspx" />
     <Content Include="LimitPerson.aspx" />
+    <Content Include="test.aspx" />
     <Content Include="WSumDose.aspx" />
     <Content Include="AlarmEPD.aspx" />
     <Content Include="TaskNG.aspx" />
@@ -268,7 +276,7 @@
           <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
         </WebProjectProperties>
       </FlavorProperties>
-      <UserProperties UseAjaxifiedTemplates="False" UseJQuerySupport="False" />
+      <UserProperties UseJQuerySupport="False" UseAjaxifiedTemplates="False" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/eDos/eDos.csproj.user b/eDos/eDos.csproj.user
index 22360d8..2fe678e 100644
--- a/eDos/eDos.csproj.user
+++ b/eDos/eDos.csproj.user
@@ -15,7 +15,7 @@
     <VisualStudio>
       <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
         <WebProjectProperties>
-          <StartPageUrl>TaskNG.aspx</StartPageUrl>
+          <StartPageUrl>test.aspx</StartPageUrl>
           <StartAction>SpecificPage</StartAction>
           <AspNetDebugging>True</AspNetDebugging>
           <SilverlightDebugging>False</SilverlightDebugging>
diff --git a/eDos/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/eDos/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index f21bd5e..b783376 100644
Binary files a/eDos/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/eDos/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ
diff --git a/eDos/obj/Debug/eDos.csproj.CoreCompileInputs.cache b/eDos/obj/Debug/eDos.csproj.CoreCompileInputs.cache
index ea2f293..064e970 100644
--- a/eDos/obj/Debug/eDos.csproj.CoreCompileInputs.cache
+++ b/eDos/obj/Debug/eDos.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-443ccc52533da3427bbf9597959cb02f2e85d9f7
+e7a5a58b5497b6cde523b4f98e1bba67b8f23612
diff --git a/eDos/obj/Debug/eDos.csprojAssemblyReference.cache b/eDos/obj/Debug/eDos.csprojAssemblyReference.cache
deleted file mode 100644
index 7abfd4f..0000000
Binary files a/eDos/obj/Debug/eDos.csprojAssemblyReference.cache and /dev/null differ
diff --git a/eDos/test.aspx b/eDos/test.aspx
new file mode 100644
index 0000000..b924f00
--- /dev/null
+++ b/eDos/test.aspx
@@ -0,0 +1,24 @@
+<%@ Page Title="" Language="C#" MasterPageFile="~/Site.master" AutoEventWireup="true" CodeBehind="test.aspx.cs" Inherits="Rems2018.test" %>
+<asp:Content ID="Content1" ContentPlaceHolderID="head" runat="server">
+</asp:Content>
+<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder1" runat="server">
+           <div>
+            <asp:literal runat="server" Text="" ID="user" />
+            <br />
+            <asp:literal runat="server" Text="sql1.sck.be"  />
+            <asp:literal runat="server" Text="" ID="sqlOk" />
+            <br /><br />
+            <asp:literal runat="server" Text="scksrv23.sckcen.be"  />
+            <asp:literal runat="server" Text="" ID="sql2Ok" />
+
+            <br /><br />
+            <asp:literal runat="server" Text="Aanvrager"  />
+            <asp:literal runat="server" Text="" ID="AanvragerID" />
+
+                        <br /><br />
+            <asp:literal runat="server" Text="Lang"  />
+            <asp:literal runat="server" Text="" ID="Lang" />
+
+
+        </div>
+</asp:Content>
diff --git a/eDos/test.aspx.cs b/eDos/test.aspx.cs
new file mode 100644
index 0000000..128af36
--- /dev/null
+++ b/eDos/test.aspx.cs
@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace Rems2018
+{
+    public partial class test : System.Web.UI.Page
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            user.Text = "Logon On Page: " + User.Identity.Name + " , Type:" + User.Identity.AuthenticationType;
+            string cs = "Data Source=HPHDB;Integrated Security=SSPI; ";
+            using (System.Data.SqlClient.SqlConnection cn = new System.Data.SqlClient.SqlConnection(cs))
+            {
+                try
+                {
+                    cn.Open();
+                    sqlOk.Text = "OK";
+                }
+                catch (System.Exception ex)
+                {
+                    sqlOk.Text = ex.Message;
+                }
+            }
+
+            
+
+            //var UInfo = new Common.UserInfo();
+            //if (UInfo != null)
+            //{
+            //    AanvragerID.Text = UInfo.AanvragerID.ToString();
+            //    Lang.Text = UInfo.lang;
+            //}
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/eDos/test.aspx.designer.cs b/eDos/test.aspx.designer.cs
new file mode 100644
index 0000000..3e05556
--- /dev/null
+++ b/eDos/test.aspx.designer.cs
@@ -0,0 +1,60 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Rems2018 {
+    
+    
+    public partial class test {
+        
+        /// <summary>
+        /// user control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Literal user;
+        
+        /// <summary>
+        /// sqlOk control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Literal sqlOk;
+        
+        /// <summary>
+        /// sql2Ok control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Literal sql2Ok;
+        
+        /// <summary>
+        /// AanvragerID control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Literal AanvragerID;
+        
+        /// <summary>
+        /// Lang control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Literal Lang;
+    }
+}
diff --git a/eDos/web.config b/eDos/web.config
index f803747..7cfbe22 100644
--- a/eDos/web.config
+++ b/eDos/web.config
@@ -2,10 +2,11 @@
 <configuration>
   <connectionStrings>
     <add name="HPH_REMS_newConnectionString" connectionString="Data Source=sqlsrv3;Initial Catalog=HPH_REMS_new;Integrated Security=True" providerName="System.Data.SqlClient" />
+    <add name="eDosConnectionString" connectionString="Data Source=HPHDB;Initial Catalog=eDos;Integrated Security=True" providerName="System.Data.SqlClient" />
   </connectionStrings>
   <appSettings>
-    <add key="Telerik.Web.UI.RenderMode" value="Classic" />
-    <add key="ValidationSettings:UnobtrusiveValidationMode" value="None" />
+  <add key="Telerik.Web.UI.RenderMode" value="Classic" />
+  <add key="ValidationSettings:UnobtrusiveValidationMode" value="None" />
   <add key="Telerik.Skin" value="WebBlue" />
   <add key="Telerik.ScriptManager.TelerikCdn" value="Enabled" />
   <add key="Telerik.StyleSheetManager.TelerikCdn" value="Enabled" />