diff --git a/system/controllers/prepaid.php b/system/controllers/prepaid.php
index 8a9cb2d2..b3cf7e32 100644
--- a/system/controllers/prepaid.php
+++ b/system/controllers/prepaid.php
@@ -168,6 +168,7 @@ switch ($action) {
         $id_plan = _post('id_plan');
         $recharged_on = _post('recharged_on');
         $expiration = _post('expiration');
+        $time = _post('time');
 
         $id = _post('id');
         $d = ORM::for_table('tbl_user_recharges')->find_one($id);
@@ -182,6 +183,7 @@ switch ($action) {
             $d->plan_id = $id_plan;
             $d->recharged_on = $recharged_on;
             $d->expiration = $expiration;
+            $d->time = $time;
             $d->save();
             Package::changeTo($username, $id_plan);
             _log('[' . $admin['username'] . ']: ' . 'Edit Plan for Customer ' . $d['username'] . ' to [' . $d['plan_name'] . '][' . Lang::moneyFormat($d['price']) . ']', 'Admin', $admin['id']);
diff --git a/ui/ui/prepaid-edit.tpl b/ui/ui/prepaid-edit.tpl
index 03abd043..d95009cc 100644
--- a/ui/ui/prepaid-edit.tpl
+++ b/ui/ui/prepaid-edit.tpl
@@ -3,57 +3,62 @@
 <div class="row">
     <div class="col-sm-12">
         <div class="panel panel-primary">
-            <div class="panel-heading"><h3 class="panel-title">{$_L['Recharge_Account']}</h3></div>
+            <div class="panel-heading">
+                <h3 class="panel-title">{$_L['Recharge_Account']}</h3>
+            </div>
             <div class="panel-body">
                 <form class="form-horizontal" method="post" role="form" action="{$_url}prepaid/edit-post">
-				<input type="hidden" name="id" value="{$d['id']}">
+                    <input type="hidden" name="id" value="{$d['id']}">
                     <div class="form-group">
-						<label class="col-md-2 control-label">{$_L['Select_Account']}</label>
-						<div class="col-md-6">
-							<input type="text" class="form-control" id="username" name="username" value="{$d['username']}" readonly>
-						</div>
+                        <label class="col-md-2 control-label">{$_L['Select_Account']}</label>
+                        <div class="col-md-6">
+                            <input type="text" class="form-control" id="username" name="username"
+                                value="{$d['username']}" readonly>
+                        </div>
                     </div>
 
                     <div class="form-group">
-						<label class="col-md-2 control-label">{$_L['Service_Plan']}</label>
-						<div class="col-md-6">
-							<select id="id_plan" name="id_plan" class="form-control select2">
+                        <label class="col-md-2 control-label">{$_L['Service_Plan']}</label>
+                        <div class="col-md-6">
+                            <select id="id_plan" name="id_plan" class="form-control select2">
                                 {foreach $p as $ps}
-									<option value="{$ps['id']}" {if $d['plan_id'] eq $ps['id']} selected {/if}>{$ps['name_plan']}</option>
+                                    <option value="{$ps['id']}" {if $d['plan_id'] eq $ps['id']} selected {/if}>
+                                        {$ps['name_plan']}</option>
                                 {/foreach}
                             </select>
-						</div>
+                        </div>
                     </div>
 
                     <div class="form-group">
-						<label class="col-md-2 control-label">{$_L['Created_On']}</label>
-						<div class="col-md-6">
-							<div class="input-group date" id="datepicker1">
-								<input type="text" class="form-control" id="recharged_on" name="recharged_on" value="{$d['recharged_on']}">
-								<span class="input-group-addon ion ion-calendar"></span>
-							</div>
-						</div>
+                        <label class="col-md-2 control-label">{$_L['Created_On']}</label>
+                        <div class="col-md-6">
+                            <input type="date" class="form-control" id="recharged_on" name="recharged_on"
+                                value="{$d['recharged_on']}">
+                        </div>
                     </div>
                     <div class="form-group">
-						<label class="col-md-2 control-label">{$_L['Expires_On']}</label>
-						<div class="col-md-6">
-							<div class="input-group date" id="datepicker2">
-								<input type="text" class="form-control" id="expiration" name="expiration" value="{$d['expiration']}">
-								<span class="input-group-addon ion ion-calendar"></span>
-							</div>
-						</div>
+                        <label class="col-md-2 control-label">{$_L['Expires_On']}</label>
+                        <div class="col-md-4">
+                            <input type="date" class="form-control" id="expiration" name="expiration"
+                                value="{$d['expiration']}">
+                        </div>
+                        <div class="col-md-2">
+                            <input type="time" class="form-control" id="time" name="time" min="00:00" max="23:59"
+                                value="{$d['time']}">
+                        </div>
                     </div>
 
-					<div class="form-group">
-						<div class="col-lg-offset-2 col-lg-10">
-							<button class="btn btn-success waves-effect waves-light" type="submit">{$_L['Edit']}</button>
-							Or <a href="{$_url}prepaid/list">{$_L['Cancel']}</a>
-						</div>
-					</div>
+                    <div class="form-group">
+                        <div class="col-lg-offset-2 col-lg-10">
+                            <button class="btn btn-success waves-effect waves-light"
+                                type="submit">{$_L['Edit']}</button>
+                            Or <a href="{$_url}prepaid/list">{$_L['Cancel']}</a>
+                        </div>
+                    </div>
                 </form>
             </div>
         </div>
     </div>
 </div>
 
-{include file="sections/footer.tpl"}
+{include file="sections/footer.tpl"}
\ No newline at end of file
diff --git a/ui/ui/reports-period.tpl b/ui/ui/reports-period.tpl
index 67a378b6..557c2932 100644
--- a/ui/ui/reports-period.tpl
+++ b/ui/ui/reports-period.tpl
@@ -10,19 +10,13 @@
                     <div class="form-group">
                         <label class="col-md-3 control-label">{$_L['From_Date']}</label>
                         <div class="col-md-9">
-                            <div class="input-group" id="datepicker1">
-                                <input type="date" class="form-control" value="{$tdate}" name="fdate" id="fdate">
-                                <span class="input-group-addon"><i class=" ion ion-calendar"></i></span>
-                            </div>
+                            <input type="date" class="form-control" value="{$tdate}" name="fdate" id="fdate">
                         </div>
                     </div>
                     <div class="form-group">
                         <label class="col-md-3 control-label">{$_L['To_Date']}</label>
                         <div class="col-md-9">
-                            <div class="input-group date" id="datepicker2">
-                                <input type="date" class="form-control" value="{$mdate}" name="tdate" id="tdate">
-                                <span class="input-group-addon"><i class=" ion ion-calendar"></i></span>
-                            </div>
+                        <input type="date" class="form-control" value="{$mdate}" name="tdate" id="tdate">
                         </div>
                     </div>
                     <div class="form-group">