diff --git a/conf/Sccp.class.php.v433 b/conf/Sccp.class.php.v433
index 46fbbda..253caef 100644
--- a/conf/Sccp.class.php.v433
+++ b/conf/Sccp.class.php.v433
@@ -31,21 +31,9 @@ class Sccp extends \FreePBX\modules\Core\Driver {
         );
     }
 
-/*        public function addDevice1($id, $settings) {
-                $sql = 'INSERT INTO sccp (id, keyword, data, flags) values (?,?,?,?)';
-                $sth = $this->database->prepare($sql);
-                $settings = is_array($settings)?$settings:array();
-                foreach($settings as $key => $setting) {
-                        $sth->execute(array($id,$key,$setting['value'],$setting['flag']));
-                }
-                return true;
-        }
-*/
     public function addDevice($id, $settings) {
+        global $currentcomponent;
         $add_fld = array ("name"=>'label',"outboundcid"=>'cid_num',"langcode"=>'language',"extdisplay"=>'description');
-        //                print_r($_REQUEST);
-        //                echo '<br><br>';
-        //                die(print_r($settings));
         $settings['cid_num']['value'] = '';
         $settings['cid_name']['value'] = $label;
         $settings['mailbox']['value']= '';
@@ -84,7 +72,6 @@ class Sccp extends \FreePBX\modules\Core\Driver {
             }
         }
 
-        //                die(print_r($settings));
         $tech = Array();
         $sql = "DESCRIBE sccpline";
         foreach ($this->database->query($sql) as $row) {
@@ -102,6 +89,10 @@ class Sccp extends \FreePBX\modules\Core\Driver {
 
         $sth = $this->database->prepare($sql);
         $sth->execute();
+        // Redirect to SCCP Phone page. This was last function in add so
+        // should be safe. Prefer to add in Hooks, but is not followed
+        // even if set for $currentcomponent
+        redirect("config.php?display=sccp_phone", false);
         return true;
     }
 
diff --git a/sccpManTraits/bmoFunctions.php b/sccpManTraits/bmoFunctions.php
index 9d54576..1bd6817 100644
--- a/sccpManTraits/bmoFunctions.php
+++ b/sccpManTraits/bmoFunctions.php
@@ -3,12 +3,40 @@
 namespace FreePBX\modules\Sccp_manager\sccpManTraits;
 
 trait bmoFunctions {
-    /* unused but FPBX API requires it */
+
+    //Need to reload freePBX for modifications below to work
+
+    //want to catch extensions
+    public static function myConfigPageInits() {
+        return array("extensions");
+    }
 
     public function doConfigPageInit($page) {
+        if ($page == "extensions") {
+        }
         $this->doGeneralPost();
     }
 
+    // Try to change extensions which is part of core
+    public static function myGuiHooks() {
+        return array('core');
+    }
+
+    public function doGuiHook(&$cc) {
+        if ($_REQUEST['display'] == "extensions" ) {
+      			if ($_REQUEST['tech_hardware'] == 'sccp_custom')  {
+                /*
+                this is the add extensions form
+                On submit returns to extensions page. Users prefer that it returns
+                To Sccp Phone.
+                Below adds redirect URL, but it is not followed
+                $cc->setRedirectURL("config.php?display=sccp_phone");
+                so force redirect at end of addDevice in SccpClass
+                */  
+            }
+        }
+    }
+
     /* unused but FPBX API requires it */
 
     public function install() {
@@ -85,7 +113,6 @@ trait bmoFunctions {
                         'value' => _("Cancel")
                     ),
                 );
-
                 break;
             case 'sccpsettings':
                 $buttons = array(
@@ -101,7 +128,6 @@ trait bmoFunctions {
                         'value' => _("Cancel")
                     ),
                 );
-
                 break;
         }
         return $buttons;
@@ -109,7 +135,7 @@ trait bmoFunctions {
 
     public function getRightNav($request) {
         if (isset($request['tech_hardware']) && ($request['tech_hardware'] == 'cisco')) {
-            return load_view("/var/www/html/admin/modules/sccp_manager/views/hardware.rnav.php", array('request' => $request));
+            return load_view($_SERVER['DOCUMENT_ROOT'] .'/admin/modules/sccp_manager/views/hardware.rnav.php', array('request' => $request));
         }
     }
 
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..d6cde2a 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> -->
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.rnav.php b/views/hardware.rnav.php
index 3080456..89914b8 100644
--- a/views/hardware.rnav.php
+++ b/views/hardware.rnav.php
@@ -3,7 +3,7 @@
         <i class="fa fa-list"></i>&nbsp;
         <?php echo _("List Device")?>
     </a>
-    <a class="btn btn-default" href="config.php?display=sccp_phone&amp;tech_hardware=cisco">
+    <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")?>
     </a>
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>