diff --git a/sccpManTraits/bmoFunctions.php b/sccpManTraits/bmoFunctions.php
index 9d54576..9bbd35e 100644
--- a/sccpManTraits/bmoFunctions.php
+++ b/sccpManTraits/bmoFunctions.php
@@ -3,12 +3,41 @@
 namespace FreePBX\modules\Sccp_manager\sccpManTraits;
 
 trait bmoFunctions {
-    /* unused but FPBX API requires it */
+
+    //Need to reload freePBX for modifications below to work
+
+    //need to catch extensions
+    public static function myConfigPageInits() {
+        dbug('have config page inits');
+        return array("extensions");
+    }
 
     public function doConfigPageInit($page) {
+        if ($page == "extensions") {
+            dbug('have extensions in doConfigPageInit');
+        }
         $this->doGeneralPost();
     }
 
+    // Try to change extensions which is part of core
+    public static function myGuiHooks() {
+        return array('core');
+    }
+
+    public function doGuiHook(&$cc) {
+        dbug('$_REQUEST', $_REQUEST);
+        //dbug('CC', $cc);
+        if ($_REQUEST['display'] == "extensions" ) {
+      			if (isset($_REQUEST['tech_hardware']))  {
+                dbug('Have caught hook in doGuiHook');
+                $this->getActionBar($_REQUEST);
+            }
+        //$cc->addguielem("_top", new \gui_pageheading('', 'I added a header', false));
+        }
+    }
+
+
+
     /* unused but FPBX API requires it */
 
     public function install() {
@@ -85,7 +114,6 @@ trait bmoFunctions {
                         'value' => _("Cancel")
                     ),
                 );
-
                 break;
             case 'sccpsettings':
                 $buttons = array(
@@ -101,7 +129,30 @@ trait bmoFunctions {
                         'value' => _("Cancel")
                     ),
                 );
-
+                break;
+                case 'extensions':
+                    // only called from configpage inits
+                    $buttons = array(
+                    'submit' => array(
+                        'name' => 'ajaxsubmit',
+                        'id' => 'ajaxsubmit',
+                        'data-search' => '?display=sccp_custom',
+                        'value' => _("Save")
+                    ),
+                    'Save' => array(
+                        'name' => 'ajaxsubmit2',
+                        'id' => 'ajaxsubmit2',
+                        'stayonpage' => 'yes',
+                        'value' => _("Save + Continue")
+                    ),
+                    'cancel' => array(
+                        'name' => 'cancel',
+                        'id' => 'ajaxcancel',
+                        'data-search' => '?display=sccp_custom',
+                        'data-hash' => 'sccpdevice',
+                        'value' => _("Cancel")
+                    ),
+                    );
                 break;
         }
         return $buttons;
diff --git a/views/advserver.dialtemplate.php b/views/advserver.dialtemplate.php
index cc37ab7..e7bd7bf 100644
--- a/views/advserver.dialtemplate.php
+++ b/views/advserver.dialtemplate.php
@@ -12,12 +12,12 @@
             <div class="display no-border">
                 <h1><?php echo _("Cisco Dial Template") ?></h1>
                 <div id="toolbar-sccp-dialtemplate">
-                    <a class="btn btn-default" href="config.php?display=sccp_adv&amp;tech_hardware=dialplan&amp;extdisplay=*new*"><i class="fa fa-plus">&nbsp;</i><?php echo _("Add Dialplan") ?></a>
+                    <a class="btn btn-default" href="config.php?display=sccp_adv&tech_hardware=dialplan&extdisplay=*new*"><i class="fa fa-plus">&nbsp;</i><?php echo _("Add Dialplan") ?></a>
                     <button id="remove-sccp-dialtemplate" class="btn btn-danger btn-remove" data-type="dialtemplate" data-section="sccp-dialtemplate" disabled>
                         <i class="glyphicon glyphicon-remove"></i> <span><?php echo _('Delete') ?></span>
                     </button>
                 </div>
-                <table data-cookie="true" data-cookie-id-table="sccp-dialtemplate-table" data-url="ajax.php?module=sccp_manager&amp;command=getDialTemplate" data-cache="false" data-show-refresh="true" data-toolbar="#toolbar-dialtemplate" data-maintain-selected="true" data-show-columns="true" data-show-toggle="true" data-toggle="table" data-pagination="true" data-search="true" class="table table-striped ext-list-sccp" id="table-sccp-dialtemplate" data-id="id">
+                <table data-cookie="true" data-cookie-id-table="sccp-dialtemplate-table" data-url="ajax.php?module=sccp_manager&command=getDialTemplate" data-cache="false" data-show-refresh="true" data-toolbar="#toolbar-dialtemplate" data-maintain-selected="true" data-show-columns="true" data-show-toggle="true" data-toggle="table" data-pagination="true" data-search="true" class="table table-striped ext-list-sccp" id="table-sccp-dialtemplate" data-id="id">
                     <thead>
                         <tr>
 <!--                            <th data-checkbox="true"></th> -->
@@ -39,4 +39,4 @@
         }
         return  exp_model;
     }
-</script>
\ No newline at end of file
+</script>
diff --git a/views/advserver.keyset.php b/views/advserver.keyset.php
index 2dc039c..6228047 100644
--- a/views/advserver.keyset.php
+++ b/views/advserver.keyset.php
@@ -54,7 +54,7 @@ $keynamearray = array('onhook'    => array('sname' => 'ONHOOK', 'name' =>'Displa
                         <div id="toolbar-all">
                             <button type="button" class="btn btn-primary btn-lg" data-toggle="modal" onclick="load_oncliсk(this,'*new*')" data-target=".edit_new_keyset"><i class="fa fa-bolt"></i> <?php echo _("Add Keyset"); ?></button>
             </div>
-                        <table data-cookie="true" data-cookie-id-table="sccp_keyset-all" data-url="ajax.php?module=sccp_manager&amp;command=getSoftKey&amp;type=active" data-cache="false" data-show-refresh="true" data-toolbar="#toolbar-all" data-maintain-selected="true" data-show-columns="true" data-show-toggle="true" data-toggle="table" data-pagination="true" data-search="true" class="table table-striped ext-list" id="softkey-all" data-unique-id="softkeys">
+                        <table data-cookie="true" data-cookie-id-table="sccp_keyset-all" data-url="ajax.php?module=sccp_manager&command=getSoftKey&type=active" data-cache="false" data-show-refresh="true" data-toolbar="#toolbar-all" data-maintain-selected="true" data-show-columns="true" data-show-toggle="true" data-toggle="table" data-pagination="true" data-search="true" class="table table-striped ext-list" id="softkey-all" data-unique-id="softkeys">
                             <thead>
                                 <tr>
 <!--                                    <th data-checkbox="true"></th> -->
@@ -72,7 +72,7 @@ $keynamearray = array('onhook'    => array('sname' => 'ONHOOK', 'name' =>'Displa
                 </tr>
                             </thead>
                             <tbody>
-                                
+
                             </tbody>
             </table>
             </div>
@@ -101,9 +101,9 @@ $keynamearray = array('onhook'    => array('sname' => 'ONHOOK', 'name' =>'Displa
                         <span id="new_devmodel-help" class="help-block fpbx-help-block">Help. max len = 15</span>
                 </div></div></div>
 
-                
+
                 <ul class="nav nav-tabs" role="tablist">
-                
+
 <?php
                 $i = 0;
 foreach ($keysetarray as $key => $value) {
@@ -129,7 +129,7 @@ foreach ($keysetarray as $key => $value) {
     }
     echo '<div class="element-container"><div class="row"><div class="form-group"><div class="col-md-3"><label class="control-label" for="'.$key.'">'._($keynamearray[$key]['name']).'</label>';
     echo '<i class="fa fa-question-circle fpbx-help-icon" data-for="'.$key.'"></i></div>';
-                    
+
         echo '<div class="col-md-4"><select multiple class="form-control sccpmultiselect" name="av_'.$key.'" id="source_'.$key.'">';
     $row_dada= explode(',', $value);
     foreach ($row_dada as $data) {
@@ -145,19 +145,19 @@ foreach ($keysetarray as $key => $value) {
     echo '</div></div></div></div>';
     $i ++;
 }
-?>                                        
-                </div>    
-                
+?>
+                </div>
+
             </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
                 <button type="button" class="btn btn-primary sccp_update" data-id="keyset_add" data-mode="new" id="keyset_add" data-dismiss="modal">Save</button>
-            </div>            
+            </div>
         </div>
     </div>
 </div>
 
-    
+
 
 <script>
     function DispayActionsKeyFormatter(value, row, index) {
@@ -168,4 +168,4 @@ foreach ($keysetarray as $key => $value) {
         }
         return  exp_model;
     }
-</script>
\ No newline at end of file
+</script>
diff --git a/views/advserver.model.php b/views/advserver.model.php
index 2b13cf7..3ff44cf 100644
--- a/views/advserver.model.php
+++ b/views/advserver.model.php
@@ -33,7 +33,7 @@
                         </ul>
                     </div>
                 </div>
-                <table data-cookie="true" data-row-style="SetRowColor" data-cookie-id-table="sccp_model-all" data-url="ajax.php?module=sccp_manager&amp;command=getDeviceModel&amp;type=enabled" data-cache="false" data-show-refresh="true" data-toolbar="#toolbar-model" data-maintain-selected="true" data-show-columns="true" data-show-toggle="true" data-toggle="table" data-pagination="true" data-search="true" class="table table-condensed" id="table-models" data-id="model" data-unique-id="model">
+                <table data-cookie="true" data-row-style="SetRowColor" data-cookie-id-table="sccp_model-all" data-url="ajax.php?module=sccp_manager&command=getDeviceModel&type=enabled" data-cache="false" data-show-refresh="true" data-toolbar="#toolbar-model" data-maintain-selected="true" data-show-columns="true" data-show-toggle="true" data-toggle="table" data-pagination="true" data-search="true" class="table table-condensed" id="table-models" data-id="model" data-unique-id="model">
                    <thead>
                         <tr>
                             <th data-checkbox="true"></th>
diff --git a/views/hardware.extension.php b/views/hardware.extension.php
index e7eefed..32d1e0a 100644
--- a/views/hardware.extension.php
+++ b/views/hardware.extension.php
@@ -18,9 +18,9 @@ if (!empty($this->sccpvalues['system_rouminguser'])) {
             <div class="display no-border">
                 <h1><?php echo _("Extensions (Line)") ?></h1>
                 <div id="toolbar-sccp-extension">
-                    <a class="btn btn-default" href="config.php?display=extensions&amp;tech_hardware=sccp_custom"><i class="fa fa-plus">&nbsp;</i><?php echo _("Add Extension") ?></a>
+                    <a class="btn btn-default" href="config.php?display=extensions&tech_hardware=sccp_custom"><i class="fa fa-plus">&nbsp;</i><?php echo _("Add Extension") ?></a>
                 </div>
-                <table data-cookie="true" data-cookie-id-table="sccp-extension-table" data-url="ajax.php?module=sccp_manager&amp;command=getExtensionGrid&amp;type=sccp" data-cache="false" data-show-refresh="true" data-toolbar="#toolbar-sip" data-maintain-selected="true" data-show-columns="true" data-show-toggle="true" data-toggle="table" data-pagination="true" data-search="true" class="table table-striped ext-list-sccp" id="table-sccp-extension" data-id="name">
+                <table data-cookie="true" data-cookie-id-table="sccp-extension-table" data-url="ajax.php?module=sccp_manager&command=getExtensionGrid&type=sccp" data-cache="false" data-show-refresh="true" data-toolbar="#toolbar-sip" data-maintain-selected="true" data-show-columns="true" data-show-toggle="true" data-toggle="table" data-pagination="true" data-search="true" class="table table-striped ext-list-sccp" id="table-sccp-extension" data-id="name">
                     <thead>
                         <tr>
 <!--                            <th data-checkbox="true"></th> -->
@@ -39,12 +39,12 @@ if (!empty($this->sccpvalues['system_rouminguser'])) {
     function DispayPhoneActionsKeyFormatter(value, row, index) {
         var exp_dev = '';
         var rmn_dev = '<?php echo $roming_enable ?>';
-        exp_dev += '<a href="config.php?display=extensions&amp;extdisplay=' + row['name'] + '"><i class="fa fa-pencil"></i></a> &nbsp;';
-        exp_dev += '<a class="clickable delete" data-id="' + row['name'] + '"><i class="fa fa-trash"></i></a>';
+        exp_dev += "<a href="config.php?display=extensions&extdisplay=' + row['name'] + '"><i class="fa fa-pencil"></i></a> &nbsp;";
+        exp_dev += "<a class="clickable delete" data-id="' + row['name'] + '"><i class="fa fa-trash"></i></a>";
         if (rmn_dev == 'yes') {
-            exp_dev += '<a href="config.php?display=sccp_phone&amp;tech_hardware=r_user&amp;ru_id=' + row['name'] + '"><i class="fa fa-bicycle"></i></a> &nbsp;';
+            exp_dev += "<a href="config.php?display=sccp_phone&tech_hardware=r_user&ru_id=' + row['name'] + '"><i class="fa fa-bicycle"></i></a> &nbsp;";
         }
         return  exp_dev;
-        return  '<a href="config.php?display=extensions&amp;extdisplay=' + row['name'] + '"><i class="fa fa-pencil"></i></a> &nbsp;<a class="clickable delete" data-id="' + row['name'] + '"><i class="fa fa-trash"></i></a>';
+        return  "<a href="config.php?display=extensions&extdisplay=' + row['name'] + '"><i class="fa fa-pencil"></i></a> &nbsp;<a class="clickable delete" data-id="' + row['name'] + '"><i class="fa fa-trash"></i></a>";
     }
 </script>
diff --git a/views/hardware.phone.php b/views/hardware.phone.php
index cf83ae4..a18f259 100644
--- a/views/hardware.phone.php
+++ b/views/hardware.phone.php
@@ -14,7 +14,7 @@
             <div class="display no-border">
                 <h1><?php echo _("Device SCCP Phone") ?></h1>
                 <div id="toolbar-sccp-phone">
-                    <a class="btn btn-default" href="config.php?display=sccp_phone&amp;tech_hardware=cisco"><i class="fa fa-plus">&nbsp;</i><?php echo _("Add Device Phone") ?></a>
+                    <a class="btn btn-default" href="config.php?display=sccp_phone&tech_hardware=cisco"><i class="fa fa-plus">&nbsp;</i><?php echo _("Add Device Phone") ?></a>
                     <button id="remove-sccp-phone" class="btn btn-danger sccp_update btn-tab-select" data-id="delete_hardware" disabled>
                         <i class="glyphicon glyphicon-remove"></i> <span><?php echo _('Delete') ?></span>
                     </button>
@@ -31,7 +31,7 @@
                         <i class="glyphicon glyphicon-ok"></i> <span><?php echo _('Reset Token Device') ?></span>
                     </button>
                 </div>
-                <table data-cookie="true" data-cookie-id-table="sccp-phone" data-url="ajax.php?module=sccp_manager&amp;command=getPhoneGrid&amp;type=sccp" data-cache="false" data-show-refresh="true" data-toolbar="#toolbar-sccp" data-maintain-selected="true" data-show-columns="true" data-show-toggle="true" data-toggle="table" data-pagination="true" data-search="true" class="table table-striped ext-list" id="table-sccp" data-id="mac">
+                <table data-cookie="true" data-cookie-id-table="sccp-phone" data-url="ajax.php?module=sccp_manager&command=getPhoneGrid&type=sccp" data-cache="false" data-show-refresh="true" data-toolbar="#toolbar-sccp" data-maintain-selected="true" data-show-columns="true" data-show-toggle="true" data-toggle="table" data-pagination="true" data-search="true" class="table table-striped ext-list" id="table-sccp" data-id="mac">
                     <thead>
                         <tr>
                             <th data-checkbox="true"></th>
diff --git a/views/hardware.sphone.php b/views/hardware.sphone.php
index 7ee550d..7d5094a 100644
--- a/views/hardware.sphone.php
+++ b/views/hardware.sphone.php
@@ -14,7 +14,7 @@
             <div class="display no-border">
                 <h1><?php echo _("Device SIP Phone") ?></h1>
                 <div id="toolbar-sccp-sphone">
-                    <a class="btn btn-default" href="config.php?display=sccp_phone&amp;tech_hardware=cisco-sip"><i class="fa fa-plus">&nbsp;</i><?php echo _("Add Device Phone") ?></a>
+                    <a class="btn btn-default" href="config.php?display=sccp_phone&tech_hardware=cisco-sip"><i class="fa fa-plus">&nbsp;</i><?php echo _("Add Device Phone") ?></a>
                     <button id="remove-sccp-sphone" class="btn btn-danger sccp_update btn-tab-select" data-id="delete_hardware" disabled>
                         <i class="glyphicon glyphicon-remove"></i> <span><?php echo _('Delete') ?></span>
                     </button>
@@ -25,11 +25,11 @@
                         <i class="glyphicon glyphicon-ok"></i> <span><?php echo _('Reset Device') ?></span>
                     </button>
                 </div>
-                <table data-cookie="true" data-cookie-id-table="sccp-sphone" data-url="ajax.php?module=sccp_manager&amp;command=getPhoneGrid&amp;type=cisco-sip" data-cache="false" data-show-refresh="true" data-toolbar="#toolbar-sip" data-maintain-selected="true" data-show-columns="true" data-show-toggle="true" data-toggle="table" data-pagination="true" data-search="true" class="table table-striped ext-list" id="table-sip" data-id="mac">
+                <table data-cookie="true" data-cookie-id-table="sccp-sphone" data-url="ajax.php?module=sccp_manager&command=getPhoneGrid&type=cisco-sip" data-cache="false" data-show-refresh="true" data-toolbar="#toolbar-sip" data-maintain-selected="true" data-show-columns="true" data-show-toggle="true" data-toggle="table" data-pagination="true" data-search="true" class="table table-striped ext-list" id="table-sip" data-id="mac">
                     <thead>
                         <tr>
                             <th data-checkbox="true"></th>
-                            <th data-sortable="true" data-field="mac"><?php echo _('Device SEP ID') ?></th>                            
+                            <th data-sortable="true" data-field="mac"><?php echo _('Device SEP ID') ?></th>
                             <th data-sortable="true" data-field="description"><?php echo _('Device  Descriptions') ?></th>
                             <th data-sortable="true" data-formatter="DispayTypeFormatter" data-field="type"><?php echo _('Device type') ?></th>
                             <th data-sortable="true" data-field="button" data-formatter="LineFormatter"><?php echo _('Line') ?></th>
@@ -51,9 +51,9 @@
             exp_model += '<a href="?display=sccp_phone&tech_hardware=cisco-sip&new_id=' + row['name'] + '&type='+ row['type'];
             if (row['addon'] !== null ) {
                 exp_model += '&addon='+ row['addon'];
-            }            
+            }
             exp_model += '"><i class="fa fa-pencil"></i></a> &nbsp; &nbsp;\n';
-            
+
         } else {
             exp_model += '<a href="?display=sccp_phone&tech_hardware=cisco-sip&id=' + row['name'] + '"><i class="fa fa-pencil"></i></a> &nbsp; &nbsp;\n';
             exp_model += '</a> &nbsp;<a class="btn-item-delete" data-for="hardware" data-id="' + row['name'] + '"><i class="fa fa-trash"></i></a>';
@@ -71,13 +71,13 @@
                 exp_model += ' + ' + row['addon'];
             }
         }
-        return  exp_model;        
+        return  exp_model;
     }
     function LineFormatterS(value, row, index) {
         if (value === null)  {
             return  '-- EMPTY --';
         }
-        var data = value.split(";"); 
+        var data = value.split(";");
         result = '';
         for (var i = 0; i < data.length; i++) {
           var val = data[i].split(',');
@@ -87,5 +87,5 @@
     }
         return  result;
     }
-    
-</script>
\ No newline at end of file
+
+</script>