diff --git a/lib/screens/patient_search_screen.dart b/lib/screens/patient_search_screen.dart
index 76b78bed..fcf0a538 100644
--- a/lib/screens/patient_search_screen.dart
+++ b/lib/screens/patient_search_screen.dart
@@ -100,7 +100,7 @@ class _PatientSearchState extends State<PatientSearch> {
                       },
                     ),
                     SizedBox(
-                      height: 20,
+                      height: 15,
                     ),
                     Text(
                       'Middle Name',
@@ -136,7 +136,7 @@ class _PatientSearchState extends State<PatientSearch> {
                       },
                     ),
                     SizedBox(
-                      height: 20,
+                      height: 15,
                     ),
                     Text(
                       'Last Name',
@@ -172,7 +172,7 @@ class _PatientSearchState extends State<PatientSearch> {
                       },
                     ),
                     SizedBox(
-                      height: 20,
+                      height: 15,
                     ),
                     Text(
                       'Phone Number',
@@ -208,15 +208,15 @@ class _PatientSearchState extends State<PatientSearch> {
                       },
                     ),
                     SizedBox(
-                      height: 20,
+                      height: 15,
                     ),
                     // Container(child: GridView(gridDelegate: null,),)
                     
                     SizedBox(
-                      height: 20,
+                      height: 15,
                     ),
                     Text(
-                      'Patiant Type',
+                      'Patiant ID',
                       style: TextStyle(fontSize: 20),
                     ),
                     SizedBox(
@@ -224,7 +224,7 @@ class _PatientSearchState extends State<PatientSearch> {
                     ),
                     TextFormField(
                       decoration: InputDecoration(
-                          hintText: 'Enter ID',
+                          hintText: 'Patiant ID',
                           hintStyle: TextStyle(
                               fontSize: isSmallScreen
                                   ? 14
@@ -249,10 +249,10 @@ class _PatientSearchState extends State<PatientSearch> {
                       },
                     ),
                     SizedBox(
-                      height: 20,
+                      height: 15,
                     ),
                     Text(
-                      'Patiant Type',
+                      'Patiant File',
                       style: TextStyle(fontSize: 20),
                     ),
                     SizedBox(
@@ -260,7 +260,7 @@ class _PatientSearchState extends State<PatientSearch> {
                     ),
                     TextFormField(
                       decoration: InputDecoration(
-                          hintText: 'Enter ID',
+                          hintText: 'Patiant File',
                           hintStyle: TextStyle(
                               fontSize: isSmallScreen
                                   ? 14
@@ -285,10 +285,10 @@ class _PatientSearchState extends State<PatientSearch> {
                       },
                     ),
                     SizedBox(
-                      height: 20,
+                      height: 15,
                     ),
                     Text(
-                      'Patiant Type',
+                      'From',
                       style: TextStyle(fontSize: 20),
                     ),
                     SizedBox(
@@ -296,7 +296,7 @@ class _PatientSearchState extends State<PatientSearch> {
                     ),
                     TextFormField(
                       decoration: InputDecoration(
-                          hintText: 'Enter ID',
+                          hintText: 'From',
                           hintStyle: TextStyle(
                               fontSize: isSmallScreen
                                   ? 14
@@ -321,8 +321,54 @@ class _PatientSearchState extends State<PatientSearch> {
                       },
                     ),
                     SizedBox(
-                      height: 20,
-                    )
+                      height: 15,
+                    ),Text(
+                      'TO',
+                      style: TextStyle(fontSize: 20),
+                    ),
+                    SizedBox(
+                      height: 15,
+                    ),
+                    TextFormField(
+                      decoration: InputDecoration(
+                          hintText: 'To',
+                          hintStyle: TextStyle(
+                              fontSize: isSmallScreen
+                                  ? 14
+                                  : constraints.maxWidth * 0.024),
+                          enabledBorder: OutlineInputBorder(
+                            borderRadius: BorderRadius.all(Radius.circular(20)),
+                            borderSide: BorderSide(color: Hexcolor('#CCCCCC')),
+                          ),
+                          focusedBorder: OutlineInputBorder(
+                            borderRadius:
+                                BorderRadius.all(Radius.circular(10.0)),
+                            borderSide: BorderSide(
+                                color: Theme.of(context).primaryColor),
+                          )
+                          //BorderRadius.all(Radius.circular(20));
+                          ),
+                      validator: (value) {
+                        if (value.isEmpty) {
+                          return 'Please enter some text';
+                        }
+                        return null;
+                      },
+                    ),
+                     SizedBox(
+                      height: 15,
+                    ),
+                    Container(
+                  child: Column(
+                    mainAxisAlignment: MainAxisAlignment.start,
+                    children: <Widget>[
+                      Checkbox(
+                          value: true,
+                          activeColor: Theme.of(context).primaryColor,
+                          onChanged: (bool newValue) {}),
+                      Text("Remember me", style: TextStyle(fontSize:isSmallScreen?18:constraints.maxWidth*0.018)),
+                    ],
+                  ),)
                   ],
                 ),
               ),