diff --git a/DataTables/GenderDataTable.php b/DataTables/GenderDataTable.php
index 4284a83..0285921 100644
--- a/DataTables/GenderDataTable.php
+++ b/DataTables/GenderDataTable.php
@@ -2,7 +2,7 @@
 
     namespace Modules\Master\DataTables;
 
-    use Modules\Gender\Entities\Gender;
+    use Modules\Master\Entities\Gender;
     use Yajra\DataTables\Html\Column;
     use Yajra\DataTables\Services\DataTable;
 
@@ -28,11 +28,12 @@
                 })
                 ->addIndexColumn()
                 ->addColumn('status', function ($model) {
-                    return $model->status == 1 ? 'Active' : 'Inactive';
+                    return view('master::gender._status', compact('model'));
                 })
                 ->addColumn('action', function ($model) {
                     return view('master::gender._action', compact('model'));
-                });
+                })
+                ->rawColumns(['status','action']);
         }
 
         /**
@@ -55,7 +56,7 @@
         public function html()
         {
             return $this->builder()
-                ->setTableId('gender-table')
+                ->setTableId('master-gender-table')
                 ->columns($this->getColumns())
                 ->minifiedAjax()
                 ->orderBy(1, 'asc')
@@ -79,10 +80,11 @@
             return [
                 Column::make('DT_RowIndex')->title('No')->orderable(false)->searchable(false),
                 Column::make('name')->title(__('Name')),
-                Column::make('status')->title(__('Status')),
+                Column::computed('status')->title(__('Status'))->width(50)->addClass('text-center')->exportable(false),
                 Column::computed('action')
                     ->exportable(false)
                     ->printable(false)
+                    ->width(100)
                     ->addClass('text-center')
                     ->responsivePriority(-1),
             ];
diff --git a/Http/Controllers/GenderController.php b/Http/Controllers/GenderController.php
index c6a7ba9..ee6649e 100644
--- a/Http/Controllers/GenderController.php
+++ b/Http/Controllers/GenderController.php
@@ -20,6 +20,7 @@
 
         public function __construct()
         {
+
             $this->middleware(function ($request, $next) {
                 $this->user = Auth::guard('web')->user();
                 return $next($request);
@@ -128,7 +129,7 @@
          *
          * @return Renderable
          */
-        public function update(UpdateGenderRequest $request, Gender $company)
+        public function update(UpdateGenderRequest $request, Gender $gender)
         {
             if (is_null($this->user) || !$this->user->can($this->module->alias . '.update')) {
                 abort(403, 'Sorry !! You are Unauthorized to update any ' . $this->module->alias . ' !');
@@ -140,7 +141,7 @@
             // Update the Gender...
             if ($validated) {
                 try {
-                    $company->update($validated);
+                    $gender->update($validated);
                     echo json_encode(['status' => 'success', 'message' => $this->module->name . ' gender updated successfully.']);
                 } catch (Exception $e) {
                     echo json_encode(['status' => 'error', 'message' => $this->module->name . ' gender updated failed.']);
@@ -158,14 +159,14 @@
          *
          * @return Renderable
          */
-        public function destroy(Gender $company)
+        public function destroy(Gender $gender)
         {
             if (is_null($this->user) || !$this->user->can($this->module->alias . '.delete')) {
                 abort(403, 'Sorry !! You are Unauthorized to delete any ' . $this->module->alias . ' !');
             }
 
             try {
-                $company->delete();
+                $gender->delete();
                 echo json_encode(['status' => 'success', 'message' => $this->module->name . ' gender deleted successfully.']);
             } catch (Exception $e) {
                 echo json_encode(['status' => 'error', 'message' => $this->module->name . ' gender deleted failed.']);
diff --git a/Http/Requests/Gender/StoreGenderRequest.php b/Http/Requests/Gender/StoreGenderRequest.php
index a57be34..f7c6769 100644
--- a/Http/Requests/Gender/StoreGenderRequest.php
+++ b/Http/Requests/Gender/StoreGenderRequest.php
@@ -29,7 +29,7 @@
         {
             return [
                 'name'   => 'required|string|max:50|unique:genders,name',
-                'status' => 'nullable|string|max:1',
+                'status' => 'nullable|integer|max:1',
             ];
         }
 
@@ -63,4 +63,15 @@
                 'messages' => 'Gender created failed.'
             ], JsonResponse::HTTP_UNPROCESSABLE_ENTITY));
         }
+
+        protected function prepareForValidation()
+        {
+            $status = 0;
+            if($this->status == "on"){
+                $status = 1;
+            }
+            $this->merge([
+                'status' => $status
+            ]);
+        }
     }
diff --git a/Http/Requests/Gender/UpdateGenderRequest.php b/Http/Requests/Gender/UpdateGenderRequest.php
index 568df7a..1f99f77 100644
--- a/Http/Requests/Gender/UpdateGenderRequest.php
+++ b/Http/Requests/Gender/UpdateGenderRequest.php
@@ -28,8 +28,8 @@
         : array
         {
             return [
-                'name'   => 'required|string|max:50|unique:genders,name', $this->gender->id,
-                'status' => 'nullable|string|max:1',
+                'name'   => 'required|string|max:50|unique:genders,name,'. $this->gender->id,
+                'status' => 'nullable|integer|max:1',
             ];
         }
 
@@ -63,4 +63,16 @@
                 'messages' => 'Gender updated failed.'
             ], JsonResponse::HTTP_UNPROCESSABLE_ENTITY));
         }
+
+        protected function prepareForValidation()
+        {
+            $status = 0;
+            if($this->status == "on"){
+                $status = 1;
+            }
+            $this->merge([
+                'status' => $status
+            ]);
+        }
+
     }
diff --git a/Resources/views/gender/_action.blade.php b/Resources/views/gender/_action.blade.php
new file mode 100644
index 0000000..04f9094
--- /dev/null
+++ b/Resources/views/gender/_action.blade.php
@@ -0,0 +1,13 @@
+@php
+    $route = explode('.', Route::currentRouteName());
+@endphp
+<div class="d-flex flex-row flex-center">
+    <a href="{{ route($route[0].'.'.$route[1].'.edit',['gender' => $model->id]) }}"
+       class="kt_edit_form btn btn-icon btn-bg-light  btn-active-light-primary btn-sm me-1">
+        {!! getIcon("pencil", "fs-1 text-info","duotune") !!}
+    </a>
+
+    {!! Form::open(['method' => 'DELETE','route' => [$route[0].'.'.$route[1].'.destroy', $model->id],'class'=>'']) !!}
+    {{ Form::button(getIcon("trash", "fs-1 text-danger","duotune"), ['type' => 'submit', 'class' => 'delete btn btn-icon btn-bg-light btn-active-light-danger btn-sm'] )  }}
+    {!! Form::close() !!}
+</div>
diff --git a/Resources/views/gender/_form.blade.php b/Resources/views/gender/_form.blade.php
new file mode 100644
index 0000000..94647e5
--- /dev/null
+++ b/Resources/views/gender/_form.blade.php
@@ -0,0 +1,64 @@
+@php
+    $route = explode('.', Route::currentRouteName());
+@endphp
+
+    <!--begin::Modal - New Target-->
+<div class="modal fade" id="kt_modal_{{$route[0].'_'.$route[1]}}" tabindex="-1" aria-hidden="true">
+    <!--begin::Modal dialog-->
+    <div class="modal-dialog modal-dialog-centered mw-650px">
+        <!--begin::Modal content-->
+        <div class="modal-content rounded">
+            <!--begin::Modal header-->
+            <div class="modal-header pb-0 border-0 justify-content-end">
+                <!--begin::Close-->
+                <div class="btn btn-sm btn-icon btn-active-color-primary" data-bs-dismiss="modal">{!! getIcon('cross', 'fs-1') !!}</div>
+                <!--end::Close-->
+            </div>
+            <!--begin::Modal header-->
+            <!--begin::Modal body-->
+            <div class="modal-body scroll-y px-10 px-lg-15 pt-0 pb-15">
+                <!--begin:Form-->
+                <form class="form_{{$route[0].'_'.$route[1]}}" method="POST" action="{{ route($route[0].'.'.$route[1].'.store') }}">
+                    @csrf
+                    <!--begin::Heading-->
+                    <div class="mb-13 text-center">
+                        <!--begin::Title-->
+                        <h1 class="mb-3 text-capitalize" id="title_form">{{ str_replace('-',' ',$route[0].' '.$route[1]) }}</h1>
+                        <!--end::Title-->
+                    </div>
+                    <!--end::Heading-->
+                    <!--begin::Input group-->
+                    <div class="d-flex flex-column mb-8 fv-row">
+                        <!--begin::Label-->
+                        <label class="d-flex align-items-center fs-6 fw-semibold mb-2">
+                            <span class="required">Name</span>
+                            <span class="ms-1" data-bs-toggle="tooltip" title="Specify a target name for future usage and reference"></span>
+                        </label>
+                        <!--end::Label-->
+                        <input type="hidden" id="{{$route[0].'_'.$route[1]}}_id" name="id"/>
+                        <input type="text" id="{{$route[0].'_'.$route[1]}}_name" maxlength="50" class="form-control form-control-solid" placeholder="Enter {{ ucfirst($route[1]) }} Name" name="name"/>
+                    </div>
+                    <!--end::Input group-->
+                    <div class="form-check form-switch form-check-custom form-check-solid" style="display: block!important;">
+                        <input class="form-check-input h-20px w-30px me-5" type="checkbox" name="status" id="{{$route[0].'_'.$route[1]}}_status"/>
+                        <label class="form-check-label" for="{{$route[0].'_'.$route[1]}}_status">
+                            Aktif
+                        </label>
+                    </div>
+
+                    <!--begin::Actions-->
+                    <div class="text-center">
+                        <button type="reset" data-bs-dismiss="modal" class="btn btn-light me-3">Cancel</button>
+                        <button type="submit" class="btn btn-primary">Submit</button>
+                    </div>
+                    <!--end::Actions-->
+                </form>
+                <!--end:Form-->
+            </div>
+            <!--end::Modal body-->
+        </div>
+        <!--end::Modal content-->
+    </div>
+    <!--end::Modal dialog-->
+</div>
+<!--end::Modal - New Target-->
diff --git a/Resources/views/gender/_status.blade.php b/Resources/views/gender/_status.blade.php
new file mode 100644
index 0000000..1b62790
--- /dev/null
+++ b/Resources/views/gender/_status.blade.php
@@ -0,0 +1,10 @@
+@php
+    $route = explode('.', Route::currentRouteName());
+@endphp
+
+{!! Form::open(['method' => 'PUT','route' => [$route[0].'.'.$route[1].'.update', $model->id],'class'=>'']) !!}
+<div class="form-check form-switch form-check-custom form-check-solid" style="display: block!important;">
+    <input class="form-check-input h-20px w-30px status" {{ $model->status==1 ? 'checked' : '' }} type="checkbox" name="status" id="status"/>
+    <input type="hidden" value="{{$model->name}}" name="name">
+</div>
+{!! Form::close() !!}
diff --git a/Resources/views/gender/_table.blade.php b/Resources/views/gender/_table.blade.php
new file mode 100644
index 0000000..75ee5cc
--- /dev/null
+++ b/Resources/views/gender/_table.blade.php
@@ -0,0 +1,132 @@
+<!--begin::Table-->
+{{ $dataTable->table() }}
+<!--end::Table-->
+
+{{-- Inject Scripts --}}
+@section('scripts')
+    {{ $dataTable->scripts() }}
+@endsection
+
+@push('customscript')
+    @php
+        $route = explode('.', Route::currentRouteName());
+    @endphp
+
+    <script>
+        $("#searchbox").on("keyup search input paste cut", function () {
+            LaravelDataTables["{{$route[0].'-'.$route[1]}}-table"].search(this.value).draw();
+        });
+
+        $(function () {
+            const documentTitle = '{{ ucfirst($route[0].' '.$route[1]) }} Report';
+            var buttons = new $.fn.dataTable.Buttons(LaravelDataTables["{{$route[0].'-'.$route[1]}}-table"], {
+                buttons: [
+                    {
+                        extend: 'copyHtml5',
+                        title: documentTitle
+                    },
+                    {
+                        extend: 'excelHtml5',
+                        title: documentTitle
+                    },
+                    {
+                        extend: 'csvHtml5',
+                        title: documentTitle
+                    },
+                    {
+                        extend: 'pdfHtml5',
+                        title: documentTitle
+                    },
+                    {
+                        extend: 'print',
+                        title: documentTitle
+                    }
+                ]
+            }).container().appendTo($('#kt_datatable_example_buttons'));
+
+            // Hook dropdown menu click event to datatable export buttons
+            const exportButtons = document.querySelectorAll('#kt_datatable_example_export_menu [data-kt-export]');
+            exportButtons.forEach(exportButton => {
+                exportButton.addEventListener('click', e => {
+                    e.preventDefault();
+                    console.log(e.target.getAttribute('data-kt-export'));
+                    // Get clicked export value
+                    const exportValue = e.target.getAttribute('data-kt-export');
+                    const target = document.querySelector('.dt-buttons .buttons-' + exportValue);
+
+                    // Trigger click event on hidden datatable export buttons
+                    target.click();
+                });
+            });
+
+            LaravelDataTables["{{$route[0].'-'.$route[1]}}-table"].on('click', '.kt_edit_form', function (event) {
+                event.preventDefault();
+                $.ajax({
+                    url: $(this).attr('href'),
+                    type: 'GET',
+                    dataType: 'json',
+                    success: function (response) {
+                        $('#title_form').text('Edit {{ ucfirst(str_replace('-',' ',$route[0].' '.$route[1])) }}');
+                        $('#{{$route[0].'_'.$route[1]}}_id').val(response.id);
+                        $('#{{$route[0].'_'.$route[1]}}_name').val(response.name);
+                        $('#{{$route[0].'_'.$route[1]}}_status').prop('checked', response.status==="1");
+                        $('.form_{{$route[0].'_'.$route[1]}}').attr('action', '{{ URL::to('/'.$route[0].'/'.$route[1].'/') }}/' + response.id).append('<input type="hidden" name="_method" value="PUT">');
+                        $('#kt_modal_{{$route[0].'_'.$route[1]}}').modal('show');
+                    }
+                })
+            })
+
+            LaravelDataTables["{{$route[0].'-'.$route[1]}}-table"].on('click', '.delete', function (event) {
+                var form = $(this).closest("form");
+                event.preventDefault();
+                Swal.fire({
+                    title: 'Are you sure?',
+                    text: "You won't be able to revert this!",
+                    icon: 'warning',
+                    showCancelButton: true,
+                    confirmButtonColor: '#3085d6',
+                    cancelButtonColor: '#d33',
+                    confirmButtonText: 'Yes, delete it!'
+                }).then((result) => {
+                    if (result.isConfirmed) {
+                        $.ajax({
+                            type: "POST",
+                            url: form.attr('action'),
+                            data: form.serialize(), // serializes the form's elements.
+                            success: function (data) {
+                                toastr.success('{{ucfirst($route[0].' '.$route[1])}} has been deleted.', 'Success!', {timeOut: 5000});
+                                LaravelDataTables["{{$route[0].'-'.$route[1]}}-table"].ajax.reload();
+                            }
+                        });
+
+                    }
+                })
+            })
+
+            LaravelDataTables["{{$route[0].'-'.$route[1]}}-table"].on('change', '.status', function (event) {
+                var form = $(this).closest("form");
+                var _data = form.serializeArray().reduce(function(obj, item) {
+                    obj[item.name] = item.value;
+                    return obj;
+                }, {});
+                event.preventDefault();
+                $.ajax({
+                    type: "POST",
+                    url: form.attr('action'),
+                    data: form.serialize(), // serializes the form's elements.
+                    success: function (data) {
+                        toastr.success('{{ucfirst($route[1])}} '+_data.name+' status has been changed.', 'Success!', {timeOut: 5000});
+                    }
+                });
+            })
+        })
+    </script>
+@endpush
+
+@section('styles')
+    <style>
+        .dataTables_filter {
+            display: none;
+        }
+    </style>
+@endsection
diff --git a/Resources/views/gender/index.blade.php b/Resources/views/gender/index.blade.php
new file mode 100644
index 0000000..a003fdd
--- /dev/null
+++ b/Resources/views/gender/index.blade.php
@@ -0,0 +1,135 @@
+@php
+    $route = explode('.', Route::currentRouteName());
+@endphp
+
+<x-default-layout>
+    <!--begin::Card-->
+    <div class="card card-xxl-stretch mb-5 mb-xl-8">
+        <!--begin::Card body-->
+        <div class="card-header border-0 pt-5">
+            <div class="card-title align-items-start flex-column">
+                <div class="d-flex align-items-center position-relative my-1">
+                    <!--begin::Svg Icon | path: icons/duotune/general/gen021.svg-->
+                    <span class="svg-icon svg-icon-1 position-absolute ms-6">
+                        <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+                            <rect opacity="0.5" x="17.0365" y="15.1223" width="8.15546" height="2" rx="1"
+                                  transform="rotate(45 17.0365 15.1223)" fill="currentColor"></rect>
+                            <path
+                                d="M11 19C6.55556 19 3 15.4444 3 11C3 6.55556 6.55556 3 11 3C15.4444 3 19 6.55556 19 11C19 15.4444 15.4444 19 11 19ZM11 5C7.53333 5 5 7.53333 5 11C5 14.4667 7.53333 17 11 17C14.4667 17 17 14.4667 17 11C17 7.53333 14.4667 5 11 5Z"
+                                fill="currentColor"></path>
+                        </svg>
+                    </span>
+                    <!--end::Svg Icon-->
+                    <input type="text" id="searchbox"
+                           class="form-control form-control-solid border border-gray-300 w-250px ps-15"
+                           placeholder="Search {{ ucfirst($route[1]) }}">
+                </div>
+
+                <!--begin::Export buttons-->
+                <div id="kt_datatable_example_1_export" class="d-none"></div>
+                <!--end::Export buttons-->
+
+            </div>
+
+            <div class="card-toolbar">
+
+                <!--begin::Export dropdown-->
+                <button type="button" class="btn btn-light-primary" data-kt-menu-trigger="click"
+                        data-kt-menu-placement="bottom-end">
+                    <i class="ki-duotone ki-exit-down fs-2"><span class="path1"></span><span class="path2"></span></i>
+                    Export Report
+                </button>
+                <!--begin::Menu-->
+                <div id="kt_datatable_example_export_menu"
+                     class="menu menu-sub menu-sub-dropdown menu-column menu-rounded menu-gray-600 menu-state-bg-light-primary fw-semibold fs-7 w-200px py-4"
+                     data-kt-menu="true">
+                    <!--begin::Menu item-->
+                    <div class="menu-item px-3">
+                        <a href="#" class="menu-link px-3" data-kt-export="copy">
+                            Copy to clipboard
+                        </a>
+                    </div>
+                    <!--end::Menu item-->
+                    <!--begin::Menu item-->
+                    <div class="menu-item px-3">
+                        <a href="#" class="menu-link px-3" data-kt-export="excel">
+                            Export as Excel
+                        </a>
+                    </div>
+                    <!--end::Menu item-->
+                    <!--begin::Menu item-->
+                    <div class="menu-item px-3">
+                        <a href="#" class="menu-link px-3" data-kt-export="csv">
+                            Export as CSV
+                        </a>
+                    </div>
+                    <!--end::Menu item-->
+                    <!--begin::Menu item-->
+                    <div class="menu-item px-3">
+                        <a href="#" class="menu-link px-3" data-kt-export="pdf">
+                            Export as PDF
+                        </a>
+                    </div>
+                    <!--end::Menu item-->
+                    <!--begin::Menu item-->
+                    <div class="menu-item px-3">
+                        <a href="#" class="menu-link px-3" data-kt-export="print">
+                            Print
+                        </a>
+                    </div>
+                    <!--end::Menu item-->
+                </div>
+
+                <!--begin::Hide default export buttons-->
+                <div id="kt_datatable_example_buttons" class="d-none"></div>
+                <!--end::Hide default export buttons-->
+
+            </div>
+        </div>
+        <div class="card-body pt-6">
+            @include('master::'.$route[1].'._table')
+            @include('master::'.$route[1].'._form')
+        </div>
+        <!--end::Card body-->
+    </div>
+    <!--end::Card-->
+    @push('customscript')
+        <script>
+            $(function () {
+                $(".form_{{$route[0].'_'.$route[1]}}").submit(function (e) {
+                    e.preventDefault(); // avoid to execute the actual submit of the form.
+
+                    var form = $(this);
+                    var actionUrl = form.attr('action');
+
+                    $.ajax({
+                        type: "POST",
+                        url: actionUrl,
+                        data: form.serialize(), // serializes the form's elements.
+                        success: function (data) {
+                            var _data = JSON.parse(data);
+                            toastr.success(_data.message);
+                            form[0].reset();
+                            LaravelDataTables["{{$route[0].'-'.$route[1]}}-table"].ajax.reload();
+                            $('#kt_modal_{{$route[0].'_'.$route[1]}}').modal('hide');
+
+                        },
+                        error: function (data, textStatus, errorThrown) {
+                            var errors = data.responseJSON.errors;
+                            $.each(errors, function (key, value) {
+                                toastr.error(value);
+                            });
+                        }
+                    });
+                });
+
+                $('#kt_modal_{{$route[0].'_'.$route[1]}}').on('hidden.bs.modal', function (e) {
+                    $(".form_{{$route[0].'_'.$route[1]}}")[0].reset();
+                    $(".form_{{$route[0].'_'.$route[1]}}").attr('action', "{{ route($route[0].'.'.$route[1].'.store') }}");
+                    $(".form_{{$route[0].'_'.$route[1]}}").find('input[name="_method"]').remove();
+                    $("#title_form").html("Create {{ucfirst($route[1])}}");
+                })
+            });
+        </script>
+    @endpush
+</x-default-layout>
diff --git a/module.json b/module.json
index f4ae1b6..56cda7e 100644
--- a/module.json
+++ b/module.json
@@ -2,6 +2,7 @@
     "name": "Master",
     "alias": "master",
     "description": "",
+    "database": "",
     "keywords": [],
     "priority": 0,
     "providers": [