diff --git a/eDos/TaskBG.aspx b/eDos/TaskBG.aspx
index 2dcb4eb..ae73bc0 100644
--- a/eDos/TaskBG.aspx
+++ b/eDos/TaskBG.aspx
@@ -1,175 +1,169 @@
-<%@ Page Title="" Language="C#" MasterPageFile="~/Site.master" AutoEventWireup="true" CodeBehind="TaskBG.aspx.cs" Inherits="Rems2018.TaskBG" MaintainScrollPositionOnPostback="true" %>
+<%@ Page Title="TaskBG" Language="C#" MasterPageFile="~/Site.master" AutoEventWireup="true" CodeBehind="TaskBG.aspx.cs" Inherits="Rems2018.TaskBG" MaintainScrollPositionOnPostback="true" %>
+
 <asp:Content ID="Content1" ContentPlaceHolderID="head" runat="server">
 </asp:Content>
 <asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder1" runat="server">
-    <telerik:RadGrid ID="RadGrid1" runat="server" AllowAutomaticInserts="True" AllowAutomaticUpdates="True" AllowSorting="True" CellSpacing="-1" GridLines="Both" AllowAutomaticDeletes="True" AllowFilteringByColumn="True" AllowPaging="True" AutoGenerateColumns="False" DataSourceID="sqlDSV_Task"   OnItemDataBound="RadGrid1_ItemDataBound" PagerStyle-Mode="Slider"  >
-    <GroupingSettings CollapseAllTooltip="Collapse all groups" CaseSensitive="false">
-    </GroupingSettings>
+    <telerik:RadGrid ID="RadGrid1" runat="server" AllowAutomaticInserts="True" AllowAutomaticUpdates="True" AllowSorting="True" CellSpacing="-1" GridLines="Both" AllowAutomaticDeletes="True" AllowFilteringByColumn="True" AllowPaging="True" AutoGenerateColumns="False" DataSourceID="sqlDSV_Task" OnItemDataBound="RadGrid1_ItemDataBound" PagerStyle-Mode="Slider">
+        <GroupingSettings CollapseAllTooltip="Collapse all groups" CaseSensitive="false"></GroupingSettings>
         <ExportSettings>
             <Pdf PageWidth="">
             </Pdf>
             <Excel FileExtension="xlsx" Format="Xlsx" />
         </ExportSettings>
         <ClientSettings AllowColumnsReorder="True">
-           <%-- <Scrolling AllowScroll="True" UseStaticHeaders="True" ScrollHeight="700px" />--%>
-            
+            <%-- <Scrolling AllowScroll="True" UseStaticHeaders="True" ScrollHeight="700px" />--%>
         </ClientSettings>
-    <MasterTableView DataKeyNames="ID_Task" CommandItemDisplay="Top" AllowAutomaticDeletes="False" DataSourceID="sqlDSV_Task" EditMode="EditForms"  >
-        <CommandItemSettings ShowExportToExcelButton="True" AddNewRecordText="Add new task" />
-        <Columns>
-             <telerik:GridButtonColumn CommandName="Edit" Text="Edit" ButtonCssClass="rgEdit" UniqueName="EditColumn" HeaderStyle-Width="30px">
-                            <HeaderStyle Width="30px"></HeaderStyle>
-                        </telerik:GridButtonColumn>
+        <MasterTableView DataKeyNames="ID_Task" CommandItemDisplay="Top" AllowAutomaticDeletes="False" DataSourceID="sqlDSV_Task" EditMode="EditForms">
+            <CommandItemSettings ShowExportToExcelButton="True" AddNewRecordText="Add new task" />
+            <Columns>
+                <telerik:GridButtonColumn CommandName="Edit" Text="Edit" ButtonCssClass="rgEdit" UniqueName="EditColumn" HeaderStyle-Width="30px">
+                    <HeaderStyle Width="30px"></HeaderStyle>
+                </telerik:GridButtonColumn>
 
-            <telerik:GridBoundColumn DataField="ID_Task" DataType="System.Int32" HeaderText="ID"  UniqueName="ID_Task" ReadOnly="True" SortExpression="ID_Task" HeaderStyle-Width="90px" FilterControlWidth="60px"  >
-            </telerik:GridBoundColumn>            
-            <telerik:GridBoundColumn DataField="InstallationName" HeaderText="Installation" UniqueName="InstallationName"  SortExpression="InstallationName" FilterControlWidth="100px" HeaderStyle-Width="130px" CurrentFilterFunction="Contains" ShowFilterIcon="false" AutoPostBackOnFilter="true">
-            </telerik:GridBoundColumn>
-            <telerik:GridBoundColumn DataField="Inst_CODE" HeaderText="Code" UniqueName="Inst_CODE" DataType="System.Int32"  SortExpression="Inst_CODE" HeaderStyle-Width="60px" FilterControlAltText="Filter Inst_CODE column" >
-            </telerik:GridBoundColumn>
-<telerik:GridBoundColumn DataField="TaskType_CODE" HeaderText="Task Type" SortExpression="TaskType_CODE" UniqueName="TaskType_CODE" DataType="System.Int32" FilterControlWidth="50px" HeaderStyle-Width="110px">
-</telerik:GridBoundColumn>
-            <telerik:GridBoundColumn DataField="Task_Name" HeaderText="Task" UniqueName="Task_Name"  SortExpression="Task_Name" HeaderStyle-Width="200px">
-            </telerik:GridBoundColumn>
-            <telerik:GridBoundColumn DataField="TaskDescription"  HeaderText="Description" UniqueName="TaskDescription"  SortExpression="TaskDescription" HeaderStyle-Width="200px" >
-            </telerik:GridBoundColumn>
-            <telerik:GridBoundColumn DataField="EPDRad"  HeaderText="EPDRad" UniqueName="EPDRad"  SortExpression="EPDRad" FilterControlWidth="50px" HeaderStyle-Width="80px"  />
-            <telerik:GridBoundColumn DataField="AlarmEPDName"  HeaderText="AlarmEPD" UniqueName="AlarmEPDName" SortExpression="AlarmEPDName" HeaderStyle-Width="200px" >
-            </telerik:GridBoundColumn>
-            <telerik:GridBoundColumn DataField="TaskDateStart" HeaderText="Task Start" SortExpression="TaskDateStart" UniqueName="TaskDateStart" FilterControlAltText="Filter TaskDateStart column" DataType="System.DateTime" DataFormatString="{0:yyyy-MM-dd}"></telerik:GridBoundColumn>
-            <telerik:GridBoundColumn DataField="TaskDateEnd" DataType="System.DateTime" HeaderText="Task End" SortExpression="TaskDateEnd" UniqueName="TaskDateEnd" DataFormatString="{0:yyyy-MM-dd}">
-            </telerik:GridBoundColumn>
-            <telerik:GridCheckBoxColumn DataField="TaskEnable" DataType="System.Boolean" HeaderText="Enable" UniqueName="TaskEnable"  SortExpression="TaskEnable" HeaderStyle-Width="100px" >
-            </telerik:GridCheckBoxColumn>
-            <telerik:GridBoundColumn DataField="FNGain_AnGainValue" DataType="System.Double"  HeaderText="FN AN Gain" UniqueName="FNGain_AnGainValue"  SortExpression="FNGain_AnGainValue" HeaderStyle-Width="50px" >
-            </telerik:GridBoundColumn>
-            <telerik:GridBoundColumn DataField="InstallationActivity"  HeaderText="Activity" SortExpression="InstallationActivity" UniqueName="InstallationActivity" />
+                <telerik:GridBoundColumn DataField="ID_Task" DataType="System.Int32" HeaderText="ID" UniqueName="ID_Task" ReadOnly="True" SortExpression="ID_Task" HeaderStyle-Width="90px" FilterControlWidth="60px">
+                </telerik:GridBoundColumn>
+                <telerik:GridBoundColumn DataField="InstallationName" HeaderText="Installation" UniqueName="InstallationName" SortExpression="InstallationName" FilterControlWidth="100px" HeaderStyle-Width="130px" CurrentFilterFunction="Contains" ShowFilterIcon="false" AutoPostBackOnFilter="true">
+                </telerik:GridBoundColumn>
+                <telerik:GridBoundColumn DataField="Inst_CODE" HeaderText="Code" UniqueName="Inst_CODE" DataType="System.Int32" SortExpression="Inst_CODE" HeaderStyle-Width="60px" FilterControlAltText="Filter Inst_CODE column">
+                </telerik:GridBoundColumn>
+                <telerik:GridBoundColumn DataField="TaskType_CODE" HeaderText="Task Type" SortExpression="TaskType_CODE" UniqueName="TaskType_CODE" DataType="System.Int32" FilterControlWidth="50px" HeaderStyle-Width="110px">
+                </telerik:GridBoundColumn>
+                <telerik:GridBoundColumn DataField="Task_Name" HeaderText="Task" UniqueName="Task_Name" SortExpression="Task_Name" HeaderStyle-Width="200px">
+                </telerik:GridBoundColumn>
+                <telerik:GridBoundColumn DataField="TaskDescription" HeaderText="Description" UniqueName="TaskDescription" SortExpression="TaskDescription" HeaderStyle-Width="200px">
+                </telerik:GridBoundColumn>
+                <telerik:GridBoundColumn DataField="EPDRad" HeaderText="EPDRad" UniqueName="EPDRad" SortExpression="EPDRad" FilterControlWidth="50px" HeaderStyle-Width="80px" ReadOnly="true" />
+                <telerik:GridBoundColumn DataField="AlarmEPDName" HeaderText="AlarmEPD" UniqueName="AlarmEPDName" SortExpression="AlarmEPDName" HeaderStyle-Width="200px">
+                </telerik:GridBoundColumn>
+                <telerik:GridBoundColumn DataField="TaskDateStart" HeaderText="Task Start" SortExpression="TaskDateStart" UniqueName="TaskDateStart" FilterControlAltText="Filter TaskDateStart column" DataType="System.DateTime" DataFormatString="{0:yyyy-MM-dd}"></telerik:GridBoundColumn>
+                <telerik:GridBoundColumn DataField="TaskDateEnd" DataType="System.DateTime" HeaderText="Task End" SortExpression="TaskDateEnd" UniqueName="TaskDateEnd" DataFormatString="{0:yyyy-MM-dd}">
+                </telerik:GridBoundColumn>
+                <telerik:GridCheckBoxColumn DataField="TaskEnable" DataType="System.Boolean" HeaderText="Enable" UniqueName="TaskEnable" SortExpression="TaskEnable" HeaderStyle-Width="100px">
+                </telerik:GridCheckBoxColumn>
+                <telerik:GridBoundColumn DataField="FNGain_AnGainValue" DataType="System.Double" HeaderText="FN AN Gain" UniqueName="FNGain_AnGainValue" SortExpression="FNGain_AnGainValue" HeaderStyle-Width="50px">
+                </telerik:GridBoundColumn>
+                <telerik:GridBoundColumn DataField="InstallationActivity" HeaderText="Activity" SortExpression="InstallationActivity" UniqueName="InstallationActivity" />
 
-        </Columns>
-<EditFormSettings EditFormType="Template">
-    <FormTemplate>
-        <table style="width: 500px;">
-            <tr>
-                <td style="font-weight: bold">
-                    <asp:Label ID="Label10" runat="server" CssClass="rdfLabel rdfBlock" Text="Installation: "></asp:Label>
-                </td>
-                <td>
-                    <telerik:RadComboBox ID="RadComboBox1" runat="server" DataSourceID="SqlDSSelectInst" DataTextField="InstallationName" DataValueField="Inst_CODE" Width="95%" SelectedValue='<%# Bind("Inst_CODE") %>' />
-                </td>
-            </tr>
-            <tr>
-                <td style="font-weight: bold;">
-                    <asp:Label ID="Label11" runat="server" CssClass="rdfLabel rdfBlock" Text="Task nr. :"></asp:Label>
-                </td>
-                <td>
-                    <asp:TextBox ID="Label12" runat="server" CssClass="rdfFieldValue" Text='<%# Bind("TaskType_CODE") %>' />
-                </td>
-            </tr>
-            <tr>
-                <td style="font-weight: bold">
-                    <asp:Label ID="Label14" runat="server" AssociatedControlID="TaskEnableCheckBox" CssClass="rdfLabel rdfBlock" Text="Actif"></asp:Label>
-                </td>
-                <td>
-                    <telerik:RadCheckBox ID="TaskEnableCheckBox" runat="server" Checked='<%# Bind("TaskEnable") %>' />
-                </td>
-            </tr>
-            <tr>
-                <td style="font-weight: bold">
-                    <asp:Label ID="Label15" runat="server" CssClass="rdfLabel rdfBlock" Text="Name:"></asp:Label>
-                </td>
-                <td>
-                    <asp:TextBox ID="Label16" runat="server" CssClass="rdfFieldValue" Text='<%# Bind("Task_Name") %>' />
-                </td>
-            </tr>
+            </Columns>
+            <EditFormSettings EditFormType="Template">
+                <FormTemplate>
+                    <table style="width: 500px;">
+                        <tr>
+                            <td style="font-weight: bold">
+                                <asp:Label ID="Label10" runat="server" CssClass="rdfLabel rdfBlock" Text="Installation: "></asp:Label>
+                            </td>
+                            <td>
+                                <telerik:RadComboBox ID="RadComboBox1" runat="server" DataSourceID="SqlDSSelectInst" DataTextField="InstallationName" DataValueField="Inst_CODE" Width="95%" SelectedValue='<%# Bind("Inst_CODE") %>' />
+                            </td>
+                        </tr>
+                        <tr>
+                            <td style="font-weight: bold;">
+                                <asp:Label ID="Label11" runat="server" CssClass="rdfLabel rdfBlock" Text="Task nr. :"></asp:Label>
+                            </td>
+                            <td>
+                                <asp:TextBox ID="Label12" runat="server" CssClass="rdfFieldValue" Text='<%# Bind("TaskType_CODE") %>' />
+                            </td>
+                        </tr>
+                        <tr>
+                            <td style="font-weight: bold">
+                                <asp:Label ID="Label14" runat="server" AssociatedControlID="TaskEnableCheckBox" CssClass="rdfLabel rdfBlock" Text="Actif"></asp:Label>
+                            </td>
+                            <td>
+                                <telerik:RadCheckBox ID="TaskEnableCheckBox" runat="server" Checked='<%# Bind("TaskEnable") %>' />
+                            </td>
+                        </tr>
+                        <tr>
+                            <td style="font-weight: bold">
+                                <asp:Label ID="Label15" runat="server" CssClass="rdfLabel rdfBlock" Text="Name:"></asp:Label>
+                            </td>
+                            <td>
+                                <asp:TextBox ID="Label16" runat="server" CssClass="rdfFieldValue" Text='<%# Bind("Task_Name") %>' />
+                            </td>
+                        </tr>
 
-            <tr>
-                <td style="font-weight: bold">
-                    <asp:Label ID="Label17" runat="server" CssClass="rdfLabel rdfBlock" Text="Description:"></asp:Label>
-                </td>
-                <td>
-                    <asp:TextBox ID="Label18" runat="server" CssClass="rdfFieldValue" Text='<%# Bind("TaskDescription") %>' Width="300px" />
-                </td>
-            </tr>
-            <tr>
-                <td style="font-weight: bold">
-                    <asp:Label ID="Label19" runat="server" CssClass="rdfLabel rdfBlock" Text="Start:"></asp:Label>
-                </td>
-                <td>
-                    <telerik:RadDatePicker ID="RadDatePicker1" runat="server" DbSelectedDate='<%# Bind("TaskDateStart") %>' />
-                </td>
-            </tr>
-            <tr>
-                <td style="font-weight: bold">
-                    <asp:Label ID="Label20" runat="server" CssClass="rdfLabel rdfBlock" Text="End:"></asp:Label>
-                </td>
+                        <tr>
+                            <td style="font-weight: bold">
+                                <asp:Label ID="Label17" runat="server" CssClass="rdfLabel rdfBlock" Text="Description:"></asp:Label>
+                            </td>
+                            <td>
+                                <asp:TextBox ID="Label18" runat="server" CssClass="rdfFieldValue" Text='<%# Bind("TaskDescription") %>' Width="300px" />
+                            </td>
+                        </tr>
+                        <tr>
+                            <td style="font-weight: bold">
+                                <asp:Label ID="Label19" runat="server" CssClass="rdfLabel rdfBlock" Text="Start:"></asp:Label>
+                            </td>
+                            <td>
+                                <telerik:RadDatePicker ID="RadDatePicker1" runat="server" DbSelectedDate='<%# Bind("TaskDateStart") %>' />
+                            </td>
+                        </tr>
+                        <tr>
+                            <td style="font-weight: bold">
+                                <asp:Label ID="Label20" runat="server" CssClass="rdfLabel rdfBlock" Text="End:"></asp:Label>
+                            </td>
 
-                <td>
-                    <telerik:RadDatePicker ID="RadDatePicker2" runat="server" DbSelectedDate='<%# Bind("TaskDateEnd") %>' />
-                </td>
-            </tr>
+                            <td>
+                                <telerik:RadDatePicker ID="RadDatePicker2" runat="server" DbSelectedDate='<%# Bind("TaskDateEnd") %>' />
+                            </td>
+                        </tr>
 
-            <tr>
-                <td style="font-weight: bold">
-                    <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" />
-                </td>
-            </tr>
-           
-        </table>
-        <div class="rdfCommandButtons">
-            <hr class="rdfHr" />
-            <telerik:RadButton RenderMode="Lightweight" ID="UpdateButton" runat="server" ButtonType="SkinnedButton" CommandName='<%# (Container is GridEditFormInsertItem) ? "PerformInsert" : "Update" %>' Text='<%# (Container is GridEditFormInsertItem) ? "Insert" : "Update" %>' ToolTip="Update" />
-            <telerik:RadButton RenderMode="Lightweight" ID="CancelButton" runat="server" ButtonType="SkinnedButton" CausesValidation="False" CommandName="Cancel" Text="Cancel" ToolTip="Cancel" />
-        </div>
-    </FormTemplate>
-</EditFormSettings>
-       
-    </MasterTableView>
+                        <tr>
+                            <td style="font-weight: bold">
+                                <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" />
+                            </td>
+                        </tr>
+
+                    </table>
+                    <div class="rdfCommandButtons">
+                        <hr class="rdfHr" />
+                        <telerik:RadButton RenderMode="Lightweight" ID="UpdateButton" runat="server" ButtonType="SkinnedButton" CommandName='<%# (Container is GridEditFormInsertItem) ? "PerformInsert" : "Update" %>' Text='<%# (Container is GridEditFormInsertItem) ? "Insert" : "Update" %>' ToolTip="Update" />
+                        <telerik:RadButton RenderMode="Lightweight" ID="CancelButton" runat="server" ButtonType="SkinnedButton" CausesValidation="False" CommandName="Cancel" Text="Cancel" ToolTip="Cancel" />
+                    </div>
+                </FormTemplate>
+            </EditFormSettings>
+
+        </MasterTableView>
         <PagerStyle AlwaysVisible="True" />
-</telerik:RadGrid>
- 
-
-<asp:SqlDataSource ID="sqlDSV_Task" runat="server" 
-    ConnectionString="<%$ ConnectionStrings:HPH_REMS_newConnectionString %>" 
-    SelectCommand="TaskBGSelect"  SelectCommandType="StoredProcedure"
-    InsertCommand="TaskBGInsert" InsertCommandType="StoredProcedure"
-    UpdateCommand="TaskBGUpdate" UpdateCommandType="StoredProcedure"
-    >
-    <InsertParameters>
-        <asp:Parameter Name="Inst_CODE" Type="Int32" />
-        <asp:Parameter Name="TaskType_CODE" Type="Int32" />
-        <asp:Parameter Name="Task_Name" Type="String" />
-        <asp:Parameter Name="TaskDescription" Type="String" />
-        <asp:Parameter Name="EPDRad" Type="String" />
-        <asp:Parameter Name="ID_AlarmEPD" Type="Int32" />
-        <asp:Parameter Name="TaskDateStart" Type="DateTime" />
-        <asp:Parameter Name="TaskDateEnd" Type="DateTime" />
-        <asp:Parameter Name="TaskEnable" Type="Boolean" />
-        <asp:Parameter Name="ID_FNGainANGain" Type="Int32" />
-    </InsertParameters>
-    <UpdateParameters>
-        <asp:Parameter Name="ID_Task" Type="Int32" />
-        <asp:Parameter Name="Inst_CODE" Type="Int32" />
-        <asp:Parameter Name="TaskType_CODE" Type="Int32" />
-        <asp:Parameter Name="Task_Name" Type="String" />
-        <asp:Parameter Name="TaskDescription" Type="String" />
-        <asp:Parameter Name="ID_AlarmEPD" Type="Int32" />
-        <asp:Parameter Name="TaskDateStart" Type="DateTime" />
-        <asp:Parameter Name="TaskDateEnd" Type="DateTime" />
-        <asp:Parameter Name="TaskEnable" Type="Boolean" />
-        <asp:Parameter Direction="ReturnValue" Name="RETURN_VALUE" Type="Int32" />
-    </UpdateParameters>
-</asp:SqlDataSource>
+    </telerik:RadGrid>
 
 
-    <asp:SqlDataSource ID="SqlDSSelectInst" runat="server" ConnectionString="<%$ ConnectionStrings:HPH_REMS_newConnectionString %>" SelectCommand="SELECT [Inst_CODE], [InstallationName] FROM [Installation]"></asp:SqlDataSource>
-    <asp:SqlDataSource ID="SqlDSSelectAlarmLevel" runat="server" ConnectionString="<%$ ConnectionStrings:HPH_REMS_newConnectionString %>"
-        SelectCommand="SELECT [ID_AlarmEPD], [AlarmEPDName], [EPDRad] FROM [AlarmEPD] where epdrad='BG';">
-        <SelectParameters>
-            <asp:parameter Name="epdrad" Type="String" />
-        </SelectParameters>
+    <asp:SqlDataSource ID="sqlDSV_Task" runat="server"
+        ConnectionString="<%$ ConnectionStrings:HPH_REMS_newConnectionString %>"
+        SelectCommand="TaskBGSelect" SelectCommandType="StoredProcedure"
+        InsertCommand="TaskBGInsert" InsertCommandType="StoredProcedure"
+        UpdateCommand="TaskBGUpdate" UpdateCommandType="StoredProcedure">
+        <InsertParameters>
+            <asp:Parameter Name="Inst_CODE" Type="Int32" />
+            <asp:Parameter Name="TaskType_CODE" Type="Int32" />
+            <asp:Parameter Name="Task_Name" Type="String" />
+            <asp:Parameter Name="TaskDescription" Type="String" />
+            <asp:Parameter Name="ID_AlarmEPD" Type="Int32" />
+            <asp:Parameter Name="TaskDateStart" Type="DateTime" />
+            <asp:Parameter Name="TaskDateEnd" Type="DateTime" />
+            <asp:Parameter Name="TaskEnable" Type="Boolean" />
+            <asp:Parameter Name="ID_FNGainANGain" Type="Int32" />
+        </InsertParameters>
+        <UpdateParameters>
+            <asp:Parameter Name="ID_Task" Type="Int32" />
+            <asp:Parameter Name="Inst_CODE" Type="Int32" />
+            <asp:Parameter Name="TaskType_CODE" Type="Int32" />
+            <asp:Parameter Name="Task_Name" Type="String" />
+            <asp:Parameter Name="TaskDescription" Type="String" />
+            <asp:Parameter Name="ID_AlarmEPD" Type="Int32" />
+            <asp:Parameter Name="TaskDateStart" Type="DateTime" />
+            <asp:Parameter Name="TaskDateEnd" Type="DateTime" />
+            <asp:Parameter Name="TaskEnable" Type="Boolean" />
+            <asp:Parameter Direction="ReturnValue" Name="RETURN_VALUE" Type="Int32" />
+        </UpdateParameters>
     </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:Content>
diff --git a/eDos/TaskBG.aspx.designer.cs b/eDos/TaskBG.aspx.designer.cs
index 2a30ba8..09ff8db 100644
--- a/eDos/TaskBG.aspx.designer.cs
+++ b/eDos/TaskBG.aspx.designer.cs
@@ -21,168 +21,6 @@ namespace Rems2018 {
         /// </remarks>
         protected global::Telerik.Web.UI.RadGrid RadGrid1;
         
-        /// <summary>
-        /// Label10 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 Label10;
-        
-        /// <summary>
-        /// RadComboBox1 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 RadComboBox1;
-        
-        /// <summary>
-        /// Label11 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 Label11;
-        
-        /// <summary>
-        /// Label12 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 Label12;
-        
-        /// <summary>
-        /// Label14 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 Label14;
-        
-        /// <summary>
-        /// TaskEnableCheckBox control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::Telerik.Web.UI.RadCheckBox TaskEnableCheckBox;
-        
-        /// <summary>
-        /// Label15 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 Label15;
-        
-        /// <summary>
-        /// Label16 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 Label16;
-        
-        /// <summary>
-        /// Label17 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 Label17;
-        
-        /// <summary>
-        /// Label18 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 Label18;
-        
-        /// <summary>
-        /// Label19 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 Label19;
-        
-        /// <summary>
-        /// RadDatePicker1 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 RadDatePicker1;
-        
-        /// <summary>
-        /// Label20 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 Label20;
-        
-        /// <summary>
-        /// RadDatePicker2 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 RadDatePicker2;
-        
-        /// <summary>
-        /// Label22 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 Label22;
-        
-        /// <summary>
-        /// RadComboBoxSelectAlarmLevel 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 RadComboBoxSelectAlarmLevel;
-        
-        /// <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_Task control.
         /// </summary>
diff --git a/eDos/TaskNG.aspx b/eDos/TaskNG.aspx
index 1870224..6c3bdd3 100644
--- a/eDos/TaskNG.aspx
+++ b/eDos/TaskNG.aspx
@@ -1,183 +1,177 @@
-<%@ Page Title="" Language="C#" MasterPageFile="~/Site.master" AutoEventWireup="true" CodeBehind="TaskNG.aspx.cs" Inherits="Rems2018.TaskNG" MaintainScrollPositionOnPostback="true" %>
+<%@ Page Title="TaskNG" Language="C#" MasterPageFile="~/Site.master" AutoEventWireup="true" CodeBehind="TaskNG.aspx.cs" Inherits="Rems2018.TaskNG" MaintainScrollPositionOnPostback="true" %>
+
 <asp:Content ID="Content1" ContentPlaceHolderID="head" runat="server">
 </asp:Content>
 <asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder1" runat="server">
-    <telerik:RadGrid ID="RadGrid1" runat="server" AllowAutomaticInserts="True" AllowAutomaticUpdates="True" AllowSorting="True" CellSpacing="-1" GridLines="Both" AllowAutomaticDeletes="True" AllowFilteringByColumn="True" AllowPaging="True" AutoGenerateColumns="False" DataSourceID="sqlDSV_Task"   OnItemDataBound="RadGrid1_ItemDataBound" PagerStyle-Mode="Slider"  >
-    <GroupingSettings CollapseAllTooltip="Collapse all groups" CaseSensitive="false">
-    </GroupingSettings>
+    <telerik:RadGrid ID="RadGrid1" runat="server" AllowAutomaticInserts="True" AllowAutomaticUpdates="True" AllowSorting="True" CellSpacing="-1" GridLines="Both" AllowAutomaticDeletes="True" AllowFilteringByColumn="True" AllowPaging="True" AutoGenerateColumns="False" DataSourceID="sqlDSV_Task" OnItemDataBound="RadGrid1_ItemDataBound" PagerStyle-Mode="Slider">
+        <GroupingSettings CollapseAllTooltip="Collapse all groups" CaseSensitive="false"></GroupingSettings>
         <ExportSettings>
             <Pdf PageWidth="">
             </Pdf>
             <Excel FileExtension="xlsx" Format="Xlsx" />
         </ExportSettings>
         <ClientSettings AllowColumnsReorder="True">
-           <%-- <Scrolling AllowScroll="True" UseStaticHeaders="True" ScrollHeight="700px" />--%>
-            
+            <%-- <Scrolling AllowScroll="True" UseStaticHeaders="True" ScrollHeight="700px" />--%>
         </ClientSettings>
-    <MasterTableView DataKeyNames="ID_Task" CommandItemDisplay="Top" AllowAutomaticDeletes="False" DataSourceID="sqlDSV_Task" EditMode="EditForms"  >
-        <CommandItemSettings ShowExportToExcelButton="True" AddNewRecordText="Add new task" />
-        <Columns>
-             <telerik:GridButtonColumn CommandName="Edit" Text="Edit" ButtonCssClass="rgEdit" UniqueName="EditColumn" HeaderStyle-Width="30px">
-                            <HeaderStyle Width="30px"></HeaderStyle>
-                        </telerik:GridButtonColumn>
+        <MasterTableView DataKeyNames="ID_Task" CommandItemDisplay="Top" AllowAutomaticDeletes="False" DataSourceID="sqlDSV_Task" EditMode="EditForms">
+            <CommandItemSettings ShowExportToExcelButton="True" AddNewRecordText="Add new task" />
+            <Columns>
+                <telerik:GridButtonColumn CommandName="Edit" Text="Edit" ButtonCssClass="rgEdit" UniqueName="EditColumn" HeaderStyle-Width="30px">
+                    <HeaderStyle Width="30px"></HeaderStyle>
+                </telerik:GridButtonColumn>
 
-            <telerik:GridBoundColumn DataField="ID_Task" DataType="System.Int32" HeaderText="ID"  UniqueName="ID_Task" ReadOnly="True" SortExpression="ID_Task" HeaderStyle-Width="90px" FilterControlWidth="60px"  >
-            </telerik:GridBoundColumn>            
-            <telerik:GridBoundColumn DataField="InstallationName" HeaderText="Installation" UniqueName="InstallationName"  SortExpression="InstallationName" FilterControlWidth="100px" HeaderStyle-Width="130px" CurrentFilterFunction="Contains" ShowFilterIcon="false" AutoPostBackOnFilter="true">
-            </telerik:GridBoundColumn>
-            <telerik:GridBoundColumn DataField="Inst_CODE" HeaderText="Code" UniqueName="Inst_CODE" DataType="System.Int32"  SortExpression="Inst_CODE" HeaderStyle-Width="60px" FilterControlAltText="Filter Inst_CODE column" >
-            </telerik:GridBoundColumn>
-<telerik:GridBoundColumn DataField="TaskType_CODE" HeaderText="Task Type" SortExpression="TaskType_CODE" UniqueName="TaskType_CODE" DataType="System.Int32" FilterControlWidth="50px" HeaderStyle-Width="110px">
-</telerik:GridBoundColumn>
-            <telerik:GridBoundColumn DataField="Task_Name" HeaderText="Task" UniqueName="Task_Name"  SortExpression="Task_Name" HeaderStyle-Width="200px">
-            </telerik:GridBoundColumn>
-            <telerik:GridBoundColumn DataField="TaskDescription"  HeaderText="Description" UniqueName="TaskDescription"  SortExpression="TaskDescription" HeaderStyle-Width="200px" >
-            </telerik:GridBoundColumn>
-            <telerik:GridBoundColumn DataField="EPDRad"  HeaderText="EPDRad" UniqueName="EPDRad"  SortExpression="EPDRad" FilterControlWidth="50px" HeaderStyle-Width="80px"  />
-            <telerik:GridBoundColumn DataField="AlarmEPDName"  HeaderText="AlarmEPD" UniqueName="AlarmEPDName" SortExpression="AlarmEPDName" HeaderStyle-Width="200px" >
-            </telerik:GridBoundColumn>
-            <telerik:GridBoundColumn DataField="TaskDateStart" HeaderText="Task Start" SortExpression="TaskDateStart" UniqueName="TaskDateStart" FilterControlAltText="Filter TaskDateStart column" DataType="System.DateTime" DataFormatString="{0:yyyy-MM-dd}"></telerik:GridBoundColumn>
-            <telerik:GridBoundColumn DataField="TaskDateEnd" DataType="System.DateTime" HeaderText="Task End" SortExpression="TaskDateEnd" UniqueName="TaskDateEnd" DataFormatString="{0:yyyy-MM-dd}">
-            </telerik:GridBoundColumn>
-            <telerik:GridCheckBoxColumn DataField="TaskEnable" DataType="System.Boolean" HeaderText="Enable" UniqueName="TaskEnable"  SortExpression="TaskEnable" HeaderStyle-Width="100px" >
-            </telerik:GridCheckBoxColumn>
-            <telerik:GridBoundColumn DataField="FNGain_AnGainValue" DataType="System.Double"  HeaderText="FN AN Gain" UniqueName="FNGain_AnGainValue"  SortExpression="FNGain_AnGainValue" HeaderStyle-Width="50px" >
-            </telerik:GridBoundColumn>
-            <telerik:GridBoundColumn DataField="InstallationActivity"  HeaderText="Activity" SortExpression="InstallationActivity" UniqueName="InstallationActivity" />
+                <telerik:GridBoundColumn DataField="ID_Task" DataType="System.Int32" HeaderText="ID" UniqueName="ID_Task" ReadOnly="True" SortExpression="ID_Task" HeaderStyle-Width="90px" FilterControlWidth="60px">
+                </telerik:GridBoundColumn>
+                <telerik:GridBoundColumn DataField="InstallationName" HeaderText="Installation" UniqueName="InstallationName" SortExpression="InstallationName" FilterControlWidth="100px" HeaderStyle-Width="130px" CurrentFilterFunction="Contains" ShowFilterIcon="false" AutoPostBackOnFilter="true">
+                </telerik:GridBoundColumn>
+                <telerik:GridBoundColumn DataField="Inst_CODE" HeaderText="Code" UniqueName="Inst_CODE" DataType="System.Int32" SortExpression="Inst_CODE" HeaderStyle-Width="60px" FilterControlAltText="Filter Inst_CODE column">
+                </telerik:GridBoundColumn>
+                <telerik:GridBoundColumn DataField="TaskType_CODE" HeaderText="Task Type" SortExpression="TaskType_CODE" UniqueName="TaskType_CODE" DataType="System.Int32" FilterControlWidth="50px" HeaderStyle-Width="110px">
+                </telerik:GridBoundColumn>
+                <telerik:GridBoundColumn DataField="Task_Name" HeaderText="Task" UniqueName="Task_Name" SortExpression="Task_Name" HeaderStyle-Width="200px">
+                </telerik:GridBoundColumn>
+                <telerik:GridBoundColumn DataField="TaskDescription" HeaderText="Description" UniqueName="TaskDescription" SortExpression="TaskDescription" HeaderStyle-Width="200px">
+                </telerik:GridBoundColumn>
+                <telerik:GridBoundColumn DataField="EPDRad" HeaderText="EPDRad" UniqueName="EPDRad" SortExpression="EPDRad" FilterControlWidth="50px" HeaderStyle-Width="80px" ReadOnly="true" />
+                <telerik:GridBoundColumn DataField="AlarmEPDName" HeaderText="AlarmEPD" UniqueName="AlarmEPDName" SortExpression="AlarmEPDName" HeaderStyle-Width="200px">
+                </telerik:GridBoundColumn>
+                <telerik:GridBoundColumn DataField="TaskDateStart" HeaderText="Task Start" SortExpression="TaskDateStart" UniqueName="TaskDateStart" FilterControlAltText="Filter TaskDateStart column" DataType="System.DateTime" DataFormatString="{0:yyyy-MM-dd}"></telerik:GridBoundColumn>
+                <telerik:GridBoundColumn DataField="TaskDateEnd" DataType="System.DateTime" HeaderText="Task End" SortExpression="TaskDateEnd" UniqueName="TaskDateEnd" DataFormatString="{0:yyyy-MM-dd}">
+                </telerik:GridBoundColumn>
+                <telerik:GridCheckBoxColumn DataField="TaskEnable" DataType="System.Boolean" HeaderText="Enable" UniqueName="TaskEnable" SortExpression="TaskEnable" HeaderStyle-Width="100px">
+                </telerik:GridCheckBoxColumn>
+                <telerik:GridBoundColumn DataField="FNGain_AnGainValue" DataType="System.Double" HeaderText="FN AN Gain" UniqueName="FNGain_AnGainValue" SortExpression="FNGain_AnGainValue" HeaderStyle-Width="50px">
+                </telerik:GridBoundColumn>
+                <telerik:GridBoundColumn DataField="InstallationActivity" HeaderText="Activity" SortExpression="InstallationActivity" UniqueName="InstallationActivity" />
 
-        </Columns>
-<EditFormSettings EditFormType="Template">
-    <FormTemplate>
-        <table style="width: 500px;">
-            <tr>
-                <td style="font-weight: bold">
-                    <asp:Label ID="Label10" runat="server" CssClass="rdfLabel rdfBlock" Text="Installation: "></asp:Label>
-                </td>
-                <td>
-                    <telerik:RadComboBox ID="RadComboBox1" runat="server" DataSourceID="SqlDSSelectInst" DataTextField="InstallationName" DataValueField="Inst_CODE" Width="95%" SelectedValue='<%# Bind("Inst_CODE") %>' />
-                </td>
-            </tr>
-            <tr>
-                <td style="font-weight: bold;">
-                    <asp:Label ID="Label11" runat="server" CssClass="rdfLabel rdfBlock" Text="Task nr. :"></asp:Label>
-                </td>
-                <td>
-                    <asp:TextBox ID="Label12" runat="server" CssClass="rdfFieldValue" Text='<%# Bind("TaskType_CODE") %>' />
-                </td>
-            </tr>
-            <tr>
-                <td style="font-weight: bold">
-                    <asp:Label ID="Label14" runat="server" AssociatedControlID="TaskEnableCheckBox" CssClass="rdfLabel rdfBlock" Text="Actif"></asp:Label>
-                </td>
-                <td>
-                    <telerik:RadCheckBox ID="TaskEnableCheckBox" runat="server" Checked='<%# Bind("TaskEnable") %>' />
-                </td>
-            </tr>
-            <tr>
-                <td style="font-weight: bold">
-                    <asp:Label ID="Label15" runat="server" CssClass="rdfLabel rdfBlock" Text="Name:"></asp:Label>
-                </td>
-                <td>
-                    <asp:TextBox ID="Label16" runat="server" CssClass="rdfFieldValue" Text='<%# Bind("Task_Name") %>' />
-                </td>
-            </tr>
+            </Columns>
+            <EditFormSettings EditFormType="Template">
+                <FormTemplate>
+                    <table style="width: 500px;">
+                        <tr>
+                            <td style="font-weight: bold">
+                                <asp:Label ID="Label10" runat="server" CssClass="rdfLabel rdfBlock" Text="Installation: "></asp:Label>
+                            </td>
+                            <td>
+                                <telerik:RadComboBox ID="RadComboBox1" runat="server" DataSourceID="SqlDSSelectInst" DataTextField="InstallationName" DataValueField="Inst_CODE" Width="95%" SelectedValue='<%# Bind("Inst_CODE") %>' />
+                            </td>
+                        </tr>
+                        <tr>
+                            <td style="font-weight: bold;">
+                                <asp:Label ID="Label11" runat="server" CssClass="rdfLabel rdfBlock" Text="Task nr. :"></asp:Label>
+                            </td>
+                            <td>
+                                <asp:TextBox ID="Label12" runat="server" CssClass="rdfFieldValue" Text='<%# Bind("TaskType_CODE") %>' />
+                            </td>
+                        </tr>
+                        <tr>
+                            <td style="font-weight: bold">
+                                <asp:Label ID="Label14" runat="server" AssociatedControlID="TaskEnableCheckBox" CssClass="rdfLabel rdfBlock" Text="Actif"></asp:Label>
+                            </td>
+                            <td>
+                                <telerik:RadCheckBox ID="TaskEnableCheckBox" runat="server" Checked='<%# Bind("TaskEnable") %>' />
+                            </td>
+                        </tr>
+                        <tr>
+                            <td style="font-weight: bold">
+                                <asp:Label ID="Label15" runat="server" CssClass="rdfLabel rdfBlock" Text="Name:"></asp:Label>
+                            </td>
+                            <td>
+                                <asp:TextBox ID="Label16" runat="server" CssClass="rdfFieldValue" Text='<%# Bind("Task_Name") %>' />
+                            </td>
+                        </tr>
 
-            <tr>
-                <td style="font-weight: bold">
-                    <asp:Label ID="Label17" runat="server" CssClass="rdfLabel rdfBlock" Text="Description:"></asp:Label>
-                </td>
-                <td>
-                    <asp:TextBox ID="Label18" runat="server" CssClass="rdfFieldValue" Text='<%# Bind("TaskDescription") %>' Width="300px" />
-                </td>
-            </tr>
-            <tr>
-                <td style="font-weight: bold">
-                    <asp:Label ID="Label19" runat="server" CssClass="rdfLabel rdfBlock" Text="Start:"></asp:Label>
-                </td>
-                <td>
-                    <telerik:RadDatePicker ID="RadDatePicker1" runat="server" DbSelectedDate='<%# Bind("TaskDateStart") %>' />
-                </td>
-            </tr>
-            <tr>
-                <td style="font-weight: bold">
-                    <asp:Label ID="Label20" runat="server" CssClass="rdfLabel rdfBlock" Text="End:"></asp:Label>
-                </td>
+                        <tr>
+                            <td style="font-weight: bold">
+                                <asp:Label ID="Label17" runat="server" CssClass="rdfLabel rdfBlock" Text="Description:"></asp:Label>
+                            </td>
+                            <td>
+                                <asp:TextBox ID="Label18" runat="server" CssClass="rdfFieldValue" Text='<%# Bind("TaskDescription") %>' Width="300px" />
+                            </td>
+                        </tr>
+                        <tr>
+                            <td style="font-weight: bold">
+                                <asp:Label ID="Label19" runat="server" CssClass="rdfLabel rdfBlock" Text="Start:"></asp:Label>
+                            </td>
+                            <td>
+                                <telerik:RadDatePicker ID="RadDatePicker1" runat="server" DbSelectedDate='<%# Bind("TaskDateStart") %>' />
+                            </td>
+                        </tr>
+                        <tr>
+                            <td style="font-weight: bold">
+                                <asp:Label ID="Label20" runat="server" CssClass="rdfLabel rdfBlock" Text="End:"></asp:Label>
+                            </td>
 
-                <td>
-                    <telerik:RadDatePicker ID="RadDatePicker2" runat="server" DbSelectedDate='<%# Bind("TaskDateEnd") %>' />
-                </td>
-            </tr>
-          
-            <tr>
-                <td style="font-weight: bold">
-                    <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" />
-                </td>
-            </tr>
-            <tr>
-                <td style="font-weight: bold">
-                    <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") %>' />
-                </td>
-            </tr>
-        </table>
-        <div class="rdfCommandButtons">
-            <hr class="rdfHr" />
-            <telerik:RadButton RenderMode="Lightweight" ID="UpdateButton" runat="server" ButtonType="SkinnedButton" CommandName='<%# (Container is GridEditFormInsertItem) ? "PerformInsert" : "Update" %>' Text='<%# (Container is GridEditFormInsertItem) ? "Insert" : "Update" %>' ToolTip="Update" />
-            <telerik:RadButton RenderMode="Lightweight" ID="CancelButton" runat="server" ButtonType="SkinnedButton" CausesValidation="False" CommandName="Cancel" Text="Cancel" ToolTip="Cancel" />
-        </div>
-    </FormTemplate>
-</EditFormSettings>
-       
-    </MasterTableView>
+                            <td>
+                                <telerik:RadDatePicker ID="RadDatePicker2" runat="server" DbSelectedDate='<%# Bind("TaskDateEnd") %>' />
+                            </td>
+                        </tr>
+
+                        <tr>
+                            <td style="font-weight: bold">
+                                <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" />
+                            </td>
+                        </tr>
+                        <tr>
+                            <td style="font-weight: bold">
+                                <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") %>' />
+                            </td>
+                        </tr>
+                    </table>
+                    <div class="rdfCommandButtons">
+                        <hr class="rdfHr" />
+                        <telerik:RadButton RenderMode="Lightweight" ID="UpdateButton" runat="server" ButtonType="SkinnedButton" CommandName='<%# (Container is GridEditFormInsertItem) ? "PerformInsert" : "Update" %>' Text='<%# (Container is GridEditFormInsertItem) ? "Insert" : "Update" %>' ToolTip="Update" />
+                        <telerik:RadButton RenderMode="Lightweight" ID="CancelButton" runat="server" ButtonType="SkinnedButton" CausesValidation="False" CommandName="Cancel" Text="Cancel" ToolTip="Cancel" />
+                    </div>
+                </FormTemplate>
+            </EditFormSettings>
+
+        </MasterTableView>
         <PagerStyle AlwaysVisible="True" />
-</telerik:RadGrid>
- 
-
-<asp:SqlDataSource ID="sqlDSV_Task" runat="server" 
-    ConnectionString="<%$ ConnectionStrings:HPH_REMS_newConnectionString %>" 
-    SelectCommand="TaskNGSelect"  SelectCommandType="StoredProcedure"
-    InsertCommand="TaskNGInsert" InsertCommandType="StoredProcedure"
-    UpdateCommand="TaskNGUpdate" UpdateCommandType="StoredProcedure"
-    >
-    <InsertParameters>
-        <asp:Parameter Name="Inst_CODE" Type="Int32" />
-        <asp:Parameter Name="TaskType_CODE" Type="Int32" />
-        <asp:Parameter Name="Task_Name" Type="String" />
-        <asp:Parameter Name="TaskDescription" Type="String" />
-        <asp:Parameter Name="EPDRad" Type="String" />
-        <asp:Parameter Name="ID_AlarmEPD" Type="Int32" />
-        <asp:Parameter Name="TaskDateStart" Type="DateTime" />
-        <asp:Parameter Name="TaskDateEnd" Type="DateTime" />
-        <asp:Parameter Name="TaskEnable" Type="Boolean" />
-        <asp:Parameter Name="ID_FNGainANGain" Type="Int32" />
-    </InsertParameters>
-    <UpdateParameters>
-        <asp:Parameter Name="ID_Task" Type="Int32" />
-        <asp:Parameter Name="Inst_CODE" Type="Int32" />
-        <asp:Parameter Name="TaskType_CODE" Type="Int32" />
-        <asp:Parameter Name="Task_Name" Type="String" />
-        <asp:Parameter Name="TaskDescription" Type="String" />
-        <asp:Parameter Name="ID_AlarmEPD" Type="Int32" />
-        <asp:Parameter Name="TaskDateStart" Type="DateTime" />
-        <asp:Parameter Name="TaskDateEnd" Type="DateTime" />
-        <asp:Parameter Name="TaskEnable" Type="Boolean" />
-        <asp:Parameter Name="ID_FNGainANGain" Type="Int32" />
-        <asp:Parameter Direction="ReturnValue" Name="RETURN_VALUE" Type="Int32" />
-    </UpdateParameters>
-</asp:SqlDataSource>
+    </telerik:RadGrid>
 
 
-    <asp:SqlDataSource ID="SqlDSSelectInst" runat="server" ConnectionString="<%$ ConnectionStrings:HPH_REMS_newConnectionString %>" SelectCommand="SELECT [Inst_CODE], [InstallationName] FROM [Installation]"></asp:SqlDataSource>
+    <asp:SqlDataSource ID="sqlDSV_Task" runat="server"
+        ConnectionString="<%$ ConnectionStrings:HPH_REMS_newConnectionString %>"
+        SelectCommand="TaskNGSelect" SelectCommandType="StoredProcedure"
+        InsertCommand="TaskNGInsert" InsertCommandType="StoredProcedure"
+        UpdateCommand="TaskNGUpdate" UpdateCommandType="StoredProcedure">
+        <InsertParameters>
+            <asp:Parameter Name="Inst_CODE" Type="Int32" />
+            <asp:Parameter Name="TaskType_CODE" Type="Int32" />
+            <asp:Parameter Name="Task_Name" Type="String" />
+            <asp:Parameter Name="TaskDescription" Type="String" />
+            <asp:Parameter Name="ID_AlarmEPD" Type="Int32" />
+            <asp:Parameter Name="TaskDateStart" Type="DateTime" />
+            <asp:Parameter Name="TaskDateEnd" Type="DateTime" />
+            <asp:Parameter Name="TaskEnable" Type="Boolean" />
+            <asp:Parameter Name="ID_FNGainANGain" Type="Int32" />
+        </InsertParameters>
+        <UpdateParameters>
+            <asp:Parameter Name="ID_Task" Type="Int32" />
+            <asp:Parameter Name="Inst_CODE" Type="Int32" />
+            <asp:Parameter Name="TaskType_CODE" Type="Int32" />
+            <asp:Parameter Name="Task_Name" Type="String" />
+            <asp:Parameter Name="TaskDescription" Type="String" />
+            <asp:Parameter Name="ID_AlarmEPD" Type="Int32" />
+            <asp:Parameter Name="TaskDateStart" Type="DateTime" />
+            <asp:Parameter Name="TaskDateEnd" Type="DateTime" />
+            <asp:Parameter Name="TaskEnable" Type="Boolean" />
+            <asp:Parameter Name="ID_FNGainANGain" Type="Int32" />
+            <asp:Parameter Direction="ReturnValue" Name="RETURN_VALUE" Type="Int32" />
+        </UpdateParameters>
+    </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';">
-        <SelectParameters>
-            <asp:parameter Name="epdrad" Type="String" />
-        </SelectParameters>
     </asp:SqlDataSource>
 
     <asp:SqlDataSource ID="SqlDSSelectGain" runat="server" ConnectionString="<%$ ConnectionStrings:HPH_REMS_newConnectionString %>" SelectCommand="SELECT [ID_FNGainANGain],[FNGain_ANGainValue]
diff --git a/eDos/TaskNG.aspx.designer.cs b/eDos/TaskNG.aspx.designer.cs
index 81be2be..b57f0f6 100644
--- a/eDos/TaskNG.aspx.designer.cs
+++ b/eDos/TaskNG.aspx.designer.cs
@@ -21,186 +21,6 @@ namespace Rems2018 {
         /// </remarks>
         protected global::Telerik.Web.UI.RadGrid RadGrid1;
         
-        /// <summary>
-        /// Label10 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 Label10;
-        
-        /// <summary>
-        /// RadComboBox1 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 RadComboBox1;
-        
-        /// <summary>
-        /// Label11 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 Label11;
-        
-        /// <summary>
-        /// Label12 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 Label12;
-        
-        /// <summary>
-        /// Label14 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 Label14;
-        
-        /// <summary>
-        /// TaskEnableCheckBox control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::Telerik.Web.UI.RadCheckBox TaskEnableCheckBox;
-        
-        /// <summary>
-        /// Label15 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 Label15;
-        
-        /// <summary>
-        /// Label16 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 Label16;
-        
-        /// <summary>
-        /// Label17 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 Label17;
-        
-        /// <summary>
-        /// Label18 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 Label18;
-        
-        /// <summary>
-        /// Label19 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 Label19;
-        
-        /// <summary>
-        /// RadDatePicker1 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 RadDatePicker1;
-        
-        /// <summary>
-        /// Label20 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 Label20;
-        
-        /// <summary>
-        /// RadDatePicker2 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 RadDatePicker2;
-        
-        /// <summary>
-        /// Label22 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 Label22;
-        
-        /// <summary>
-        /// RadComboBoxSelectAlarmLevel 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 RadComboBoxSelectAlarmLevel;
-        
-        /// <summary>
-        /// Label23 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 Label23;
-        
-        /// <summary>
-        /// RadComboBox4 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 RadComboBox4;
-        
-        /// <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_Task control.
         /// </summary>
diff --git a/eDos/eDos.csproj.user b/eDos/eDos.csproj.user
index e6a8406..8c62f8b 100644
--- a/eDos/eDos.csproj.user
+++ b/eDos/eDos.csproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort />
@@ -9,14 +9,14 @@
     <IISExpressWindowsAuthentication />
     <IISExpressUseClassicPipelineMode />
     <UseGlobalApplicationHostFile />
+    <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
   </PropertyGroup>
   <ProjectExtensions>
     <VisualStudio>
       <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
         <WebProjectProperties>
-          <StartPageUrl>
-          </StartPageUrl>
-          <StartAction>CurrentPage</StartAction>
+          <StartPageUrl>TaskBG.aspx</StartPageUrl>
+          <StartAction>SpecificPage</StartAction>
           <AspNetDebugging>True</AspNetDebugging>
           <SilverlightDebugging>False</SilverlightDebugging>
           <NativeDebugging>False</NativeDebugging>
diff --git a/eDos/obj/Debug/eDos.csproj.CoreCompileInputs.cache b/eDos/obj/Debug/eDos.csproj.CoreCompileInputs.cache
index 670ad33..ea2f293 100644
--- a/eDos/obj/Debug/eDos.csproj.CoreCompileInputs.cache
+++ b/eDos/obj/Debug/eDos.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-e1bfaeb7312cc656fd6f3daa451ae27e760c3799
+443ccc52533da3427bbf9597959cb02f2e85d9f7
diff --git a/eDos/obj/Debug/eDos.csprojAssemblyReference.cache b/eDos/obj/Debug/eDos.csprojAssemblyReference.cache
index bf5d591..7abfd4f 100644
Binary files a/eDos/obj/Debug/eDos.csprojAssemblyReference.cache and b/eDos/obj/Debug/eDos.csprojAssemblyReference.cache differ