diff --git a/system/controllers/widgets.php b/system/controllers/widgets.php
index e74a8c33..d03fbcd2 100644
--- a/system/controllers/widgets.php
+++ b/system/controllers/widgets.php
@@ -95,6 +95,14 @@ if ($action == 'add') {
     } catch (Throwable $e) {
         //nothing to do
     }
+} else if ($action == 'pos') {
+    $jml = count($_POST['orders']);
+    for ($i = 0; $i < $jml; $i++) {
+        $d = ORM::for_table('tbl_widgets')->find_one($_POST['id'][$i]);
+        $d->orders = $_POST['orders'][$i];
+        $d->save();
+    }
+    r2(getUrl('widgets'), 's', 'Widget order Saved Successfully');
 } else {
     $widgets = ORM::for_table('tbl_widgets')->selects("position", 1)->order_by_asc("orders")->find_many();
     $ui->assign('widgets', $widgets);
diff --git a/ui/ui/admin/settings/widgets.tpl b/ui/ui/admin/settings/widgets.tpl
index 83d2a7ef..76c749ad 100644
--- a/ui/ui/admin/settings/widgets.tpl
+++ b/ui/ui/admin/settings/widgets.tpl
@@ -15,7 +15,7 @@
                                     <td>
                                         <div class="input-group">
                                             <span class="input-group-addon">{Lang::T("Sequence")}</span>
-                                            <input type="number" style="width: 100px;" name="orders[]" value="{$w['id']}"
+                                            <input type="number" style="width: 100px;" name="orders[]" value="{$w['orders']}"
                                                 class="form-control" placeholder="orders">
                                         </div>
                                         <input type="hidden" name="id[]" value="{$w['id']}">
@@ -48,22 +48,18 @@
 {/function}
 
 <div class="row">
-    <div class="col-md-6 col-md-offset-3">
+    <div class="col-md-6 col-lg-4">
         {showWidget widgets=$widgets pos=1}
     </div>
-</div>
-<div class="row">
-    <div class="col-md-7 border">
+    <div class="col-md-6 col-lg-4">
         {showWidget widgets=$widgets pos=2}
     </div>
-    <div class="col-md-5 border">
+    <div class="col-md-6 col-lg-4">
         {showWidget widgets=$widgets pos=3}
     </div>
-</div>
-<div class="row">
-    <div class="col-md-6 col-md-offset-3">
+    <div class="col-md-6 col-lg-4">
         {showWidget widgets=$widgets pos=4}
     </div>
 </div>
 
-{include file="sections/footer.tpl"}
+{include file="sections/footer.tpl"}
\ No newline at end of file
diff --git a/ui/ui/admin/settings/widgets_add_edit.tpl b/ui/ui/admin/settings/widgets_add_edit.tpl
index d24ebd21..18af55e5 100644
--- a/ui/ui/admin/settings/widgets_add_edit.tpl
+++ b/ui/ui/admin/settings/widgets_add_edit.tpl
@@ -7,6 +7,19 @@
                 <div class="panel-heading">{if $do == 'add'}{Lang::T('Tambah')}{else}{Lang::T('Edit')}{/if} Widget</div>
                 <div class="panel-body">
                     <input type="hidden" class="form-control" required id="id" name="id" value="{$widget['id']}">
+                    <div class="form-group">
+                        <label class="col-md-3 control-label">{Lang::T('Widget')}</label>
+                        <div class="col-md-5">
+                            <select name="widget" id="widget" class="form-control" onchange="changeTitle(this)">
+                                {foreach $widgets as $k => $v}
+                                    <option value="{$k}" {if $widget['widget'] eq $k}selected="selected" {/if}>
+                                        {$v}
+                                    </option>
+                                {/foreach}
+                            </select>
+                        </div>
+                        <p class="help-block col-md-4">&nbsp;</p>
+                    </div>
                     <div class="form-group">
                         <label class="col-md-3 control-label">{Lang::T('Title')}</label>
                         <div class="col-md-5">
@@ -19,7 +32,7 @@
                         <label class="col-md-3 control-label">{Lang::T('Sequence')}</label>
                         <div class="col-md-5">
                             <input type="number" class="form-control" id="orders" name="orders"
-                                value="{if empty($widget['orders'])}99{else}{$widget['orders']}{/if}">
+                                value="{if $widget['orders']>0}{$widget['orders']}{else}99{/if}">
                         </div>
                         <span class="help-block col-md-4">&nbsp;</span>
                     </div>
@@ -36,27 +49,14 @@
                         </div>
                         <p class="help-block col-md-4">&nbsp;</p>
                     </div>
-                    <div class="form-group">
-                        <label class="col-md-3 control-label">{Lang::T('Widget')}</label>
-                        <div class="col-md-5">
-                            <select name="widget" id="widget" class="form-control">
-                                {foreach $widgets as $k => $v}
-                                    <option value="{$k}" {if $widget['widget'] eq $k}selected="selected" {/if}>
-                                        {$v}
-                                    </option>
-                                {/foreach}
-                            </select>
-                        </div>
-                        <p class="help-block col-md-4">&nbsp;</p>
-                    </div>
                     <div class="form-group">
                         <label class="col-md-3 control-label">{Lang::T('Status')}</label>
                         <div class="col-md-5">
                             <select name="enabled" id="enabled" class="form-control">
-                                <option value="1" {if $widget['enabled'] neq 1}selected="selected" {/if}>
+                                <option value="1" {if isset($widget['enabled']) && $widget['enabled'] neq 1}selected="selected" {/if}>
                                     {Lang::T('Active')}
                                 </option>
-                                <option value="0" {if $widget['enabled'] eq 0}selected="selected" {/if}>
+                                <option value="0" {if isset($widget['enabled']) && $widget['enabled'] eq 0}selected="selected" {/if}>
                                     {Lang::T('Not Active')}
                                 </option>
                             </select>
@@ -88,4 +88,11 @@
     </div>
 </form>
 
+<script>
+    function changeTitle(sel){
+        var name = sel.options[sel.selectedIndex].text;
+        document.getElementById('title').value = name;
+    }
+</script>
+
 {include file="sections/footer.tpl"}