diff --git a/config/acl.yaml b/config/acl.yaml
index 594a23f5..f6677bdf 100644
--- a/config/acl.yaml
+++ b/config/acl.yaml
@@ -172,10 +172,6 @@ access_keys:
           label: List
         - id: geofence.add
           label: Add
-        - id: geofence.update
-          label: Update
-        - id: geofence.delete
-          label: Delete
 
     - id: rider
       label: Rider Access
diff --git a/config/routes/geofence.yaml b/config/routes/geofence.yaml
index b210e0db..5d6a2ea9 100644
--- a/config/routes/geofence.yaml
+++ b/config/routes/geofence.yaml
@@ -4,11 +4,6 @@ geofence_list:
     path: /geofence
     controller: App\Controller\GeofenceController::index
 
-geofence_rows:
-    path: /geofence/rows
-    controller: App\Controller\GeofenceController::rows
-    methods: [POST]
-
 geofence_create:
     path: /geofence/create
     controller: App\Controller\GeofenceController::addForm
@@ -18,18 +13,3 @@ geofence_create_submit:
     path: /geofence/create
     controller: App\Controller\GeofenceController::addSubmit
     methods: [POST]
-
-geofence_update:
-    path: /geofence/{id}
-    controller: App\Controller\GeofenceController::updateForm
-    methods: [GET]
-
-geofence_update_submit:
-    path: /geofence/{id}
-    controller: App\Controller\GeofenceController::updateSubmit
-    methods: [POST]
-
-geofence_delete:
-    path: /geofence/{id}
-    controller: App\Controller\GeofenceController::destroy
-    methods: [DELETE]    
diff --git a/src/Controller/GeofenceController.php b/src/Controller/GeofenceController.php
index 91585d91..f96efda2 100644
--- a/src/Controller/GeofenceController.php
+++ b/src/Controller/GeofenceController.php
@@ -23,88 +23,13 @@ class GeofenceController extends BaseController
 
         $params = $this->initParameters('geofence_list');
 
-        return $this->render('geofence/list.html.twig', $params);
-    }
-
-    public function rows(Request $req)
-    {
-        $this->denyAccessUnlessGranted('geofence.list', null, 'No access.');
-
         // get query builder
-        $qb = $this->getDoctrine()
+        $params['areas'] = $this->getDoctrine()
                 ->getRepository(SupportedArea::class)
-                ->createQueryBuilder('q');
-
-        // get datatable params
-        $datatable = $req->get('datatable');
-
-        // count total records
-        $tquery = $qb->select('COUNT(q)');
-        $this->setQueryFilters($datatable, $tquery);
-        $total = $tquery->getQuery()
-            ->getSingleScalarResult();
-
-        // get current page number
-        $page = $datatable['pagination']['page'] ?? 1;
-
-        $perpage = $datatable['pagination']['perpage'];
-        $offset = ($page - 1) * $perpage;
-
-        // add metadata
-        $meta = [
-            'page' => $page,
-            'perpage' => $perpage,
-            'pages' => ceil($total / $perpage),
-            'total' => $total,
-            'sort' => 'asc',
-            'field' => 'id'
-        ];
-
-        // build query
-        $query = $qb->select('q');
-        $this->setQueryFilters($datatable, $query);
-
-        // check if sorting is present, otherwise use default
-        if (isset($datatable['sort']['field']) && !empty($datatable['sort']['field'])) {
-            $order = $datatable['sort']['sort'] ?? 'asc';
-            $query->orderBy('q.' . $datatable['sort']['field'], $order);
-        } else {
-            $query->orderBy('q.id', 'asc');
-        }
-
-        // get rows for this page
-        $obj_rows = $query->setFirstResult($offset)
-            ->setMaxResults($perpage)
-            ->getQuery()
-            ->getResult();
-
-        // process rows
-        $rows = [];
-        foreach ($obj_rows as $orow) {
-            // add row data
-            $row['id'] = $orow->getID();
-            $row['name'] = $orow->getName();
-
-            // add row metadata
-            $row['meta'] = [
-                'update_url' => '',
-                'delete_url' => ''
-            ];
-
-            // add crud urls
-            if ($this->isGranted('geofence.update'))
-                $row['meta']['update_url'] = $this->generateUrl('geofence_update', ['id' => $row['id']]);
-            if ($this->isGranted('geofence.delete'))
-                $row['meta']['delete_url'] = $this->generateUrl('geofence_delete', ['id' => $row['id']]);
-
-            $rows[] = $row;
-        }
+                ->findAll();
 
         // response
-        return $this->json([
-            'meta' => $meta,
-            'data' => $rows
-        ]);
+        return $this->render('geofence/list.html.twig', $params);
     }
 
     public function addForm()
@@ -121,59 +46,4 @@ class GeofenceController extends BaseController
         return $this->render('geofence/form.html.twig', $params);
     }
 
-    public function updateForm($id)
-    {
-        $this->denyAccessUnlessGranted('geofence.update', null, 'No access.');
-
-        $params = $this->initParameters('geofence_list');
-
-        // get row data
-        $em = $this->getDoctrine()->getManager();
-        $obj = $em->getRepository(SupportedArea::class)->find($id);
-
-        // make sure this row exists
-        if (empty($obj))
-            throw $this->createNotFoundException('The item does not exist');
-
-        $params['obj'] = $obj;
-        $params['mode'] = 'update';
-
-        $this->fillFormTags($params);
-
-        // response
-        return $this->render('geofence/form.html.twig', $params);
-    }
-
-    protected function initFormTags(&$params)
-    {
-        // default to editing, as we have more forms editing than creating
-        $params['ftags'] = [
-            'set_map_coordinate' => true,
-        ];
-    }
-
-    protected function fillFormTags(&$params)
-    {
-        $this->initFormTags($params);
-
-        switch ($params['mode'])
-        {
-            case 'create':
-                $params['ftags']['set_map_coordinate'] = false;
-                break;
-            case 'update':
-                $params['ftags']['set_map_coordinate'] = true;
-                break;
-        }
-    }
-
-
-    protected function setQueryFilters($datatable, QueryBuilder $query)
-    {
-        if (isset($datatable['query']['data-rows-search']) && !empty($datatable['query']['data-rows-search'])) {
-            $query->where('q.name LIKE :filter')
-                ->setParameter('filter', '%' . $datatable['query']['data-rows-search'] . '%');
-        }
-    }
-
 } 
diff --git a/templates/geofence/form.html.twig b/templates/geofence/form.html.twig
deleted file mode 100644
index c1f4a976..00000000
--- a/templates/geofence/form.html.twig
+++ /dev/null
@@ -1,233 +0,0 @@
-{% extends 'base.html.twig' %}
-
-{% block body %}
-    <!-- BEGIN: Subheader -->
-    <div class="m-subheader">
-        <div class="d-flex align-items-center">
-            <div class="mr-auto">
-                <h3 class="m-subheader__title">Geofence</h3>
-            </div>
-        </div>
-    </div>
-    <!-- END: Subheader -->
-    <div class="m-content">
-        <!--Begin::Section-->
-        <div class="row">
-            <div class="col-xl-12">
-                <div class="m-portlet m-portlet--mobile">
-                    <div class="m-portlet__head">
-                        <div class="m-portlet__head-caption">
-                            <div class="m-portlet__head-title">
-                                <span class="m-portlet__head-icon">
-                                    <i class="fa fa-building"></i>
-                                </span>
-                                <h3 class="m-portlet__head-text">
-                                    {% if mode == 'update' %}
-                                        Edit Geofence 
-                                        <small>{{ obj.getName }}</small>
-                                    {% else %}
-                                        New Geofence
-                                    {% endif %}
-                                </h3>
-                            </div>
-                        </div>
-                    </div>
-                    <form id="row-form" class="m-form m-form--fit m-form--label-align-right m-form--group-seperator-dashed" method="post" action="{{ mode == 'update' ? url('geofence_update_submit', {'id': obj.getID}) : url('geofence_create_submit') }}">
-                        <div class="m-portlet__body">
-                            <div class="form-group m-form__group row no-border">
-                                <div class="col-lg-6">
-                                    <label for="name" data-field="name">
-                                        Name
-                                    </label>
-                                    <input type="text" name="name" class="form-control m-input" value="{{ obj.getName }}">
-                                    <div class="form-control-feedback hide" data-field="name"></div>
-                                </div>
-                           </div>
-                           <div class="form-group m-form__group row">
-                                <div class="col-lg-12">
-                                    <label data-field="coordinates">
-                                        Map Coordinates
-                                    </label>
-                                    <input type="hidden" id="map_lat" name="coord_lat" value="">
-                                    <input type="hidden" id="map_lng" name="coord_lng" value="">
-                                    <div class="input-group">
-                                        <input type="text" class="form-control" id="m_gmap_address" placeholder="Search">
-                                        <span class="input-group-btn">
-                                            <button class="btn btn-primary" id="m_gmap_btn">
-                                                <i class="fa fa-search"></i>
-                                            </button>
-                                        </span>
-                                    </div>
-                                    <div id="m_gmap" style="height:600px;"></div>
-                                    <div class="form-control-feedback hide" data-field="coordinates"></div>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="m-portlet__foot m-portlet__foot--fit">
-                            <div class="m-form__actions m-form__actions--solid m-form__actions--right">
-                                <div class="row">
-                                    <div class="col-lg-12">
-                                        <button type="submit" class="btn btn-success">Submit</button>
-                                        <a href="{{ url('outlet_list') }}" class="btn btn-secondary">Back</a>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </form>
-                </div>
-            </div>
-        </div>
-    </div>
-{% endblock %}
-
-{% block scripts %}
-<script src="//maps.google.com/maps/api/js?key={{ gmaps_api_key }}" type="text/javascript"></script>
-<script src="/assets/vendors/custom/gmaps/gmaps.js" type="text/javascript"></script>
-
-<script>
-
-// BEGIN google maps stuff
-function selectPoint(map, latlng) {
-    var lat = latlng.lat();
-    var lng = latlng.lng();
-
-    // show it in map
-    map.removeMarkers();
-    map.setCenter(lat, lng);
-    map.addMarker({
-        lat: lat,
-        lng: lng
-    });
-
-    // set value in hidden input
-    $('#map_lat').val(lat);
-    $('#map_lng').val(lng);
-}
-
-var map = new GMaps({
-    div: '#m_gmap',
-    lat: 14.6091,
-    lng: 121.0223,
-    click: function(e) {
-        // handle click in map
-        selectPoint(map, e.latLng);
-        e.stop();
-    }
-});
-
-var polygon = new google.maps.Polygon({
-    map: map,
-    paths: obj.getCoverageArea,
-    fillColor: "#336699",
-    fillOpacity: .5,
-})
-
-var handleAction = function() {
-    var text = $.trim($('#m_gmap_address').val());
-    GMaps.geocode({
-        address: text,
-        callback: function(results, status) {
-            map.removeMarkers();
-            if (status == 'OK') {
-                selectPoint(map, results[0].geometry.location);
-            }
-        },
-        region: 'ph'
-    });
-}
-
-$('#m_gmap_btn').click(function(e) {
-    e.preventDefault();
-    handleAction();
-});
-
-$("#m_gmap_address").keypress(function(e) {
-    var keycode = (e.keyCode ? e.keyCode : e.which);
-    if (keycode == '13') {
-        e.preventDefault();
-        handleAction();
-    }
-});
-
-{% if ftags.set_map_coordinate %}
-    // check if we need to set map
-    alert('mogol');
-    var latlng = new google.maps.LatLng({{ obj.getCoverageArea.getRing(0).getPoint(0).getLatitude }}, {{ obj.getCoverageArea.getRing(0).getPoint(0).getLongitude }});
-    alert(obj.getCoverageArea.getRing(0).getPoint(0).getLatitude);
-    selectPoint(map, latlng);
-
-{% endif %}
-
-
-// END google maps stuff
-
-$(function() {
-    $("#row-form").submit(function(e) {
-        var form = $(this);
-
-        e.preventDefault();
-
-        $.ajax({
-            method: "POST",
-            url: form.prop('action'),
-            data: form.serialize()
-        }).done(function(response) {
-            // remove all error classes
-            removeErrors();
-            swal({
-                title: 'Done!',
-                text: 'Your changes have been saved!',
-                type: 'success',
-                onClose: function() {
-                    window.location.href = "{{ url('geofence_list') }}";
-                }
-            });
-        }).fail(function(response) {
-            if (response.status == 422) {
-                var errors = response.responseJSON.errors;
-                var firstfield = false;
-
-                // remove all error classes first
-                removeErrors();
-
-                // display errors contextually
-                $.each(errors, function(field, msg) {
-                    var formfield = $("[name='" + field + "']");
-                    var label = $("label[data-field='" + field + "']");
-                    var msgbox = $(".form-control-feedback[data-field='" + field + "']");
-
-                    // add error classes to bad fields
-                    formfield.addClass('form-control-danger');
-                    label.addClass('has-danger');
-                    msgbox.html(msg).addClass('has-danger').removeClass('hide');
-
-                    // check if this field comes first in DOM
-                    var domfield = formfield.get(0);
-
-                    if (!firstfield || (firstfield && firstfield.compareDocumentPosition(domfield) === 2)) {
-                        firstfield = domfield;
-                    }
-                });
-
-                // focus on first bad field
-                firstfield.focus();
-
-                // scroll to above that field to make it visible
-                $('html, body').animate({
-                    scrollTop: $(firstfield).offset().top - 200
-                }, 100);
-            }
-        });
-    });
-
-    // remove all error classes
-    function removeErrors() {
-        $(".form-control-danger").removeClass('form-control-danger');
-        $("[data-field]").removeClass('has-danger');
-        $(".form-control-feedback[data-field]").addClass('hide');
-    }
-});
-</script>
-{% endblock %}
-
-
diff --git a/templates/geofence/list.html.twig b/templates/geofence/list.html.twig
index db6ad2cf..31dda159 100644
--- a/templates/geofence/list.html.twig
+++ b/templates/geofence/list.html.twig
@@ -5,9 +5,7 @@
     <div class="m-subheader">
         <div class="d-flex align-items-center">
             <div class="mr-auto">
-                <h3 class="m-subheader__title">
-                    Geofence 
-                </h3>
+                <h3 class="m-subheader__title">Geofence</h3>
             </div>
         </div>
     </div>
@@ -17,36 +15,30 @@
         <div class="row">
             <div class="col-xl-12">
                 <div class="m-portlet m-portlet--mobile">
-                    <div class="m-portlet__body">
-                        <div class="m-form m-form--label-align-right m--margin-top-20 m--margin-bottom-30">
-                            <div class="row align-items-center">
-                                <div class="col-xl-8 order-2 order-xl-1">
-                                    <div class="form-group m-form__group row align-items-center">
-                                        <div class="col-md-4">
-                                            <div class="m-input-icon m-input-icon--left">
-                                                <input type="text" class="form-control m-input m-input--solid" placeholder="Search..." id="data-rows-search">
-                                                <span class="m-input-icon__icon m-input-icon__icon--left">
-                                                    <span><i class="la la-search"></i></span>
-                                                </span>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-xl-4 order-1 order-xl-2 m--align-right">
-                                    <a href="{{ url('geofence_create') }}" class="btn btn-focus m-btn m-btn--custom m-btn--icon m-btn--air m-btn--pill">
-                                        <span>
-                                            <i class="fa fa-building"></i>
-                                            <span>Add Covered Area</span>
-                                        </span>
-                                    </a>
-                                    <div class="m-separator m-separator--dashed d-xl-none"></div>
+                    <div class="m-portlet__head">
+                        <div class="m-portlet__head-caption">
+                            <div class="m-portlet__head-title">
+                                <span class="m-portlet__head-icon">
+                                    <i class="fa fa-building"></i>
+                                </span>
+                                <h3 class="m-portlet__head-text">
+                                    Covered Areas
+                                </h3>
+                            </div>
+                        </div>
+                    </div>
+                    <form id="row-form" class="m-form m-form--fit m-form--label-align-right m-form--group-seperator-dashed" method="post" action="{{ url('geofence_create_submit') }}">
+                        <div class="m-portlet__body">
+                           <div class="form-group m-form__group row">
+                                <div class="col-lg-12">
+                                    <label data-field="coordinates">
+                                        Map
+                                    </label>
+                                    <div id="m_gmap" style="height:600px;"></div>
                                 </div>
                             </div>
                         </div>
-                        <!--begin: Datatable -->
-                        <div id="data-rows"></div>
-                        <!--end: Datatable -->
-                    </div>
+                    </form>
                 </div>
             </div>
         </div>
@@ -54,91 +46,45 @@
 {% endblock %}
 
 {% block scripts %}
-    <script>
-        $(function() {
-            var options = {
-                data: {
-                    type: 'remote',
-                    source: {
-                        read: {
-                            url: '{{ url("geofence_rows") }}',
-                            method: 'POST',
-                        }
-                    },
-                    saveState: {
-                        cookie: false,
-                        webstorage: false
-                    },
-                    pageSize: 10,
-                    serverPaging: true,
-                    serverFiltering: true,
-                    serverSorting: true
-                },
-                columns: [
-                {
-                    field: 'id',
-                    title: 'ID',
-                    width: 30
-                },
-                {
-                    field: 'name',
-                    title: 'Area Name'
-                },
-                {
-                    field: 'Actions',
-                    width: 110,
-                    title: 'Actions',
-                    sortable: false,
-                    overflow: 'visible',
-                    template: function (row, index, datatable) {
-                        var actions = '';
-                        if (row.meta.update_url != '') {
-                            actions += '<a href="' + row.meta.update_url + '" class="m-portlet__nav-link btn m-btn m-btn--hover-accent m-btn--icon m-btn--icon-only m-btn--pill btn-edit" data-id="' + row.name + '" title="View"><i class="la la-edit"></i></a>';
-                        }
-                        if (row.meta.delete_url != '') {
-                            actions += '<a href="' + row.meta.delete_url + '" class="m-portlet__nav-link btn m-btn m-btn--hover-danger m-btn--icon m-btn--icon-only m-btn--pill btn-delete" data-id="' + row.name + '" title="Delete"><i class="la la-trash"></i></a>';
-                        }
+<script src="//maps.google.com/maps/api/js?key={{ gmaps_api_key }}" type="text/javascript"></script>
+<script src="/assets/vendors/custom/gmaps/gmaps.js" type="text/javascript"></script>
 
-                        return actions;
-                    },
-                }
-                ],
-                search: {
-                    onEnter: false,
-                    input: $('#data-rows-search'),
-                    delay: 400
-                }
-            };
+<script>
 
-            var table = $("#data-rows").mDatatable(options);
+initMap();
+// BEGIN google maps stuff
+function initMap() {
+    var map = new google.maps.Map(document.getElementById('m_gmap'),
+    {
+        center: {lat: 14.6091, lng: 121.0223},
+        mapTypeId: 'roadmap',
+        zoom: 13 
+    });
 
-            $(document).on('click', '.btn-delete', function(e) {
-                var url = $(this).prop('href');
-                var id = $(this).data('id');
-                var btn = $(this);
+    {% for obj in areas %}
+        var pointsArray = new Array();
 
-                e.preventDefault();
+        {% for point in obj.getCoverageArea.getRing(0).getPoints() %}
+            var polylatlng = new google.maps.LatLng(
+                {{ point.getLatitude }},
+                {{ point.getLongitude }});
 
-                swal({
-                    title: 'Confirmation',
-                    html: 'Are you sure you want to delete <strong>' + id + '</strong>?',
-                    type: 'warning',
-                    showCancelButton: true
-                }).then((result) => {
-                    if (result.value) {
-                        $.ajax({
-                            method: "DELETE",
-                            url: url
-                        }).done(function(response) {
-                            table.row(btn.parents('tr')).remove();
-                            table.reload();
-                        });
-                    }
-                });
-            });
+            pointsArray.push(polylatlng);
+        {% endfor %}
+
+        var coveredarea = new google.maps.Polygon({
+            paths: pointsArray,
+            fillColor: "#FF0000",
+            fillOpacity: .5,
+            mapTypeId: 'roadmap'
         });
-    </script>
+        coveredarea.setMap(map);
+    {% endfor %}
+}
+
+// END google maps stuff
+
+</script>
 {% endblock %}
 
 
-