diff --git a/eDos/ManualReturn.aspx b/eDos/ManualReturn.aspx
index 2928b66..c026f83 100644
--- a/eDos/ManualReturn.aspx
+++ b/eDos/ManualReturn.aspx
@@ -3,12 +3,10 @@
 <asp:Content ID="Content1" ContentPlaceHolderID="head" runat="server">
 </asp:Content>
 <asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder1" runat="server">
-    <telerik:RadGrid ID="RadGrid1" runat="server" AllowAutomaticUpdates="True" AllowSorting="True" CellSpacing="-1" GridLines="Both"  AllowFilteringByColumn="True" AllowPaging="True" PageSize="100" AutoGenerateColumns="False" DataSourceID="SqlDSManualReturn">
+    <telerik:RadGrid ID="RadGrid1" runat="server" AllowAutomaticUpdates="True" AllowSorting="True" CellSpacing="-1" GridLines="Both"  AllowFilteringByColumn="True" AllowPaging="True" PageSize="100" AutoGenerateColumns="False" DataSourceID="SqlDSManualReturn" OnItemDataBound="RadGrid1_ItemDataBound">
         <GroupingSettings CollapseAllTooltip="Collapse all groups" CaseSensitive="false" />
         <SortingSettings SortedDescToolTip="ID_Visit" />
         <ExportSettings>
-            <Pdf PageWidth="">
-            </Pdf>
             <Excel FileExtension="xlsx" Format="Xlsx" />
         </ExportSettings>
         <MasterTableView DataKeyNames="ID_Station,ID_Visit" CommandItemDisplay="Top" DataSourceID="SqlDSManualReturn" EditMode="EditForms">
@@ -44,10 +42,8 @@
                 <telerik:GridCheckBoxColumn DataField="isDeleted" DataType="System.Boolean"  HeaderText="isDeleted" SortExpression="isDeleted" UniqueName="isDeleted" />
                 <telerik:GridCheckBoxColumn DataField="isAlarm" DataType="System.Boolean"  HeaderText="isAlarm" SortExpression="isAlarm" UniqueName="isAlarm" />
                 <telerik:GridCheckBoxColumn DataField="isAlarmCleared" DataType="System.Boolean"  HeaderText="isAlarmCleared" SortExpression="isAlarmCleared" UniqueName="isAlarmCleared" />
-                <telerik:GridCheckBoxColumn DataField="isManualExit" DataType="System.Boolean"  HeaderText="isManualExit" SortExpression="isManualExit" UniqueName="isManualExit" />
+                <%--<telerik:GridCheckBoxColumn DataField="isManualExit" DataType="System.Boolean"  HeaderText="isManualExit" SortExpression="isManualExit" UniqueName="isManualExit" />--%>
             </Columns>
-
-
             <EditFormSettings EditFormType="Template">
                 <FormTemplate>
                     <table>
@@ -62,47 +58,47 @@
                         </tr>
                         <tr>
                             <td style="font-weight: bold">
-                                <asp:Label ID="Label12" runat="server" CssClass="rdfLabel rdfBlock" Text="return Time:"></asp:Label>
+                                <asp:Label ID="Label12" runat="server" AssociatedControlID="dpReturnTime" CssClass="rdfLabel rdfBlock" Text="return Time:"></asp:Label>
                             </td>
                             <td>
-                                <telerik:RadDatePicker ID="RadDatePicker1" runat="server" DbSelectedDate='<%# Bind("ReturnTime") %>' />
+                                <telerik:RadDateTimePicker ID="dpReturnTime" runat="server" DbSelectedDate='<%# Bind("ReturnTime") %>' DateInput-DisplayDateFormat="yy-MM-dd HH:mm" DateInput-DateFormat="yy-MM-dd HH:mm"/>
                             </td>
                         </tr>
                         <tr>
                             <td style="font-weight: bold">
-                                <asp:Label ID="Label10" runat="server" CssClass="rdfLabel rdfBlock" Text="HP10 Dose:"></asp:Label>
+                                <asp:Label ID="Label10" runat="server" AssociatedControlID="tbHp10Dose" CssClass="rdfLabel rdfBlock" Text="HP10 Dose:"></asp:Label>
                             </td>
                             <td>
-                                <asp:textBox ID="Label11" runat="server" CssClass="rdfFieldValue" Text='<%# Bind("Hp10Dose") %>' />
+                                <asp:textBox ID="tbHp10Dose" runat="server" CssClass="rdfFieldValue" Text='<%# Bind("Hp10Dose") %>' />
                             </td>
                         </tr>
                         <tr>
                             <td style="font-weight: bold">
-                                <asp:Label ID="Label2" runat="server" CssClass="rdfLabel rdfBlock" Text="HP07 Dose:"></asp:Label>
+                                <asp:Label ID="Label2" runat="server" AssociatedControlID="tbHp07Dose" CssClass="rdfLabel rdfBlock" Text="HP07 Dose:"></asp:Label>
                             </td>
                             <td>
-                                <asp:textBox ID="Label4" runat="server" CssClass="rdfFieldValue" Text='<%# Bind("Hp07Dose") %>' />
+                                <asp:textBox ID="tbHp07Dose" runat="server" CssClass="rdfFieldValue" Text='<%# Bind("Hp07Dose") %>' />
                             </td>
                         </tr>
                         <tr>
                             <td style="font-weight: bold">
-                                <asp:Label ID="Label5" runat="server" CssClass="rdfLabel rdfBlock" Text="HP10 Max Dose Rate (peak):"></asp:Label>
+                                <asp:Label ID="Label5" runat="server" AssociatedControlID="tbHP10Peak" CssClass="rdfLabel rdfBlock" Text="HP10 Max Dose Rate (peak):"></asp:Label>
                             </td>
                             <td>
-                                <asp:textBox ID="Label7" runat="server" CssClass="rdfFieldValue" Text='<%# Bind("Hp10Peak") %>' />
+                                <asp:textBox ID="tbHP10Peak" runat="server" CssClass="rdfFieldValue" Text='<%# Bind("Hp10Peak") %>' />
                             </td>
                         </tr>
                         <tr>
                             <td style="font-weight: bold">
-                                <asp:Label ID="Label8" runat="server" CssClass="rdfLabel rdfBlock" Text="HP10 of Neutron Max Dose Rate (peak):"></asp:Label>
+                                <asp:Label ID="Label8" runat="server" AssociatedControlID="tbHp07Peak" CssClass="rdfLabel rdfBlock" Text="HP10 of Neutron Max Dose Rate (peak):"></asp:Label>
                             </td>
                             <td>
-                                <asp:textBox ID="Label9" runat="server" CssClass="rdfFieldValue" Text='<%# Bind("Hp07Peak") %>' />
+                                <asp:textBox ID="tbHp07Peak" runat="server" CssClass="rdfFieldValue" Text='<%# Bind("Hp07Peak") %>' />
                             </td>
                         </tr>
                         <tr>
                             <td style="font-weight: bold">
-                                <asp:Label ID="Label13" runat="server" CssClass="rdfLabel rdfBlock" Text="Time of the Max. Doserate HP10:"></asp:Label>
+                                <asp:Label ID="Label13" AssociatedControlID="RadDatePicker2" runat="server" CssClass="rdfLabel rdfBlock" Text="Time of the Max. Doserate HP10:"></asp:Label>
                             </td>
 
                             <td>
@@ -111,20 +107,20 @@
                         </tr>
                         <tr>
                             <td style="font-weight: bold">
-                                <asp:Label ID="Label6" runat="server" CssClass="rdfLabel rdfBlock" Text="Time of the Max. Doserate HP07 of HP N:"></asp:Label>
+                                <asp:Label ID="Label6" AssociatedControlID="CommentDate" runat="server" CssClass="rdfLabel rdfBlock" Text="Time of the Max. Doserate HP07 of HP N:"></asp:Label>
                             </td>
                             <td>
                                 <telerik:RadDateTimePicker ID="CommentDate" runat="server" DbSelectedDate='<%# Bind("Hp07Time") %>' />
                             </td>
                         </tr>
-                        <tr>
+                        <%--<tr>
                             <td>
                                 <asp:Label ID="Label1" runat="server" AssociatedControlID="isAlarmClearedCheckBox" Text="Check here to say that it is a manuel Exit:"></asp:Label>
                             </td>
                             <td>
                                 <telerik:RadCheckBox ID="isAlarmClearedCheckBox" runat="server" Checked='<%# Bind("isManualExit") %>'  />
                             </td>
-                        </tr>
+                        </tr>--%>
                     </table>
                     <div class="rdfCommandButtons">
                         <hr class="rdfHr" />
@@ -151,7 +147,6 @@
             <asp:Parameter Name="HP07Peak" Type="Double" />
             <asp:Parameter DbType="Date" Name="Hp10Time" />
             <asp:Parameter DbType="Date" Name="Hp07Time" />
-            <asp:Parameter Name="isManualExit" Type="Boolean" />
         </UpdateParameters>
     </asp:SqlDataSource>
 
diff --git a/eDos/ManualReturn.aspx.cs b/eDos/ManualReturn.aspx.cs
index 991a462..c362c3e 100644
--- a/eDos/ManualReturn.aspx.cs
+++ b/eDos/ManualReturn.aspx.cs
@@ -1,21 +1,30 @@
-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 ManualReturn : System.Web.UI.Page
-    {
-        protected void Page_Load(object sender, EventArgs e)
-        {
-
-            //Zet titel op masterpage
-            Literal titelControl = Master.FindControl("PageTitle") as Literal;
-            titelControl.Text = "Manual Return";
-
-        }
-    }
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using Telerik.Web.UI;
+
+namespace Rems2018
+{
+    public partial class ManualReturn : System.Web.UI.Page
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            //Zet titel op masterpage
+            Literal titelControl = Master.FindControl("PageTitle") as Literal;
+            titelControl.Text = "Manual Return";
+        }
+
+        protected void RadGrid1_ItemDataBound(object sender, Telerik.Web.UI.GridItemEventArgs e)
+        {
+            if (e.Item is GridEditFormItem && e.Item.IsInEditMode)
+            {
+                var item = e.Item as GridEditFormItem;
+                //(item["dpReturnTime"].Controls[0] as TextBox).Text = DateTime.Now; // bound column
+                (item.FindControl("dpReturnTime") as RadDateTimePicker).DbSelectedDate= DateTime.Now;
+            }
+        }
+    }
 }
\ No newline at end of file