diff --git a/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Config/Buttons/Sync.php b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Config/Buttons/Sync.php
new file mode 100644
index 00000000..6372802d
--- /dev/null
+++ b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Config/Buttons/Sync.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright 2013 Zendesk.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+class Zendesk_Zendesk_Block_Adminhtml_Config_Buttons_Sync extends Mage_Adminhtml_Block_System_Config_Form_Field
+{
+    protected function _prepareLayout()
+    {
+        parent::_prepareLayout();
+        if (!$this->getTemplate()) {
+            $this->setTemplate('zendesk/config/button-sync.phtml');
+        }
+        return $this;
+    }
+
+    public function render(Varien_Data_Form_Element_Abstract $element)
+    {
+        $element->unsScope()->unsCanUseWebsiteValue()->unsCanUseDefaultValue();
+        return parent::render($element);
+    }
+
+    protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element)
+    {
+        $originalData = $element->getOriginalData();
+        $this->addData(array(
+            'button_label' => Mage::helper('zendesk')->__($originalData['button_label']),
+            'html_id' => $element->getHtmlId(),
+            'url' => Mage::getSingleton('adminhtml/url')->getUrl('adminhtml/zendesk/sync')
+        ));
+
+        return $this->_toHtml();
+    }
+
+    public function getTestUrl()
+    {
+        return Mage::getSingleton('adminhtml/url')->getUrl('adminhtml/zendesk/sync');
+    }
+
+    public function getAuthHeader()
+    {
+        return 'Token token="' . Mage::helper('zendesk')->getApiToken(false) . '"';
+    }
+}
diff --git a/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Create/Customer.php b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Create/Customer.php
new file mode 100644
index 00000000..886bf58f
--- /dev/null
+++ b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Create/Customer.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright 2015 Zendesk
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+class Zendesk_Zendesk_Block_Adminhtml_Create_Customer extends Mage_Adminhtml_Block_Widget_Form_Container
+{
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->setId('zendesk_create_customer_search');
+    }
+
+    public function getHeaderText()
+    {
+        return Mage::helper('zendesk')->__('Please Select User to Add');
+    }
+    
+    public function getButtonsHtml()
+    {
+        $addButtonData = array(
+            'label' => Mage::helper('zendesk')->__('Select User'),
+            'onclick' => 'showUsers()',
+            'id'    =>  'show-users'
+        );
+        return $this->getLayout()->createBlock('adminhtml/widget_button')->setData($addButtonData)->toHtml();
+    }
+
+    public function getHeaderCssClass()
+    {
+        return 'head-catalog-customer';
+    }
+
+}
diff --git a/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Create/Customer/Grid.php b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Create/Customer/Grid.php
new file mode 100644
index 00000000..4fc956b5
--- /dev/null
+++ b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Create/Customer/Grid.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * Copyright 2015 Zendesk
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+class Zendesk_Zendesk_Block_Adminhtml_Create_Customer_Grid extends Mage_Adminhtml_Block_Widget_Grid
+{
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->setId('zendesk_create_customer_search_grid');
+        $this->setDefaultSort('entity_id');
+        $this->setUseAjax(true);
+        if ($this->getRequest()->getParam('collapse')) {
+            $this->setIsCollapsed(true);
+        }
+    }
+
+    /**
+     * Retrieve quote store object
+     * @return Mage_Core_Model_Store
+     */
+    public function getStore()
+    {
+        return Mage::getSingleton('adminhtml/session_quote')->getStore();
+    }
+
+    /**
+     * Prepare collection to be displayed in the grid
+     *
+     * @return Mage_Adminhtml_Block_Sales_Order_Create_Search_Grid
+     */
+    protected function _prepareCollection()
+    {
+        $collection = Mage::getModel('customer/customer')->getCollection()
+            ->addAttributeToSelect('firstname')
+            ->addAttributeToSelect('lastname')
+            ->addAttributeToSelect('email');
+        
+
+        $this->setCollection($collection);
+        return parent::_prepareCollection();
+    }
+
+    /**
+     * Prepare columns
+     *
+     * @return Mage_Adminhtml_Block_Sales_Order_Create_Search_Grid
+     */
+    protected function _prepareColumns()
+    {
+        $this->addColumn('entity_id', array(
+            'header'    => Mage::helper('zendesk')->__('ID'),
+            'sortable'  => true,
+            'width'     => '60',
+            'index'     => 'entity_id'
+        ));
+        $this->addColumn('firstname', array(
+            'header'    => Mage::helper('zendesk')->__('Firstname'),
+            'index'     => 'firstname'
+        ));
+        $this->addColumn('lastname', array(
+            'header'    => Mage::helper('zendesk')->__('Lastname'),
+            'index'     => 'lastname'
+        ));
+        $this->addColumn('email', array(
+            'header'    => Mage::helper('zendesk')->__('Email'),
+            'index'     => 'email'
+        ));
+        $this->addColumn('action', array(
+            'header'    => Mage::helper('zendesk')->__('Action'),
+            'renderer'  => 'zendesk/adminhtml_create_customer_grid_renderer_action',
+            'filter'    => false,
+            'sortable'  => false
+        ));
+        
+        return parent::_prepareColumns();
+    }
+
+    public function getGridUrl()
+    {
+        return $this->getUrl('adminhtml/zendesk/loadBlock', array('block'=>'customer_grid', '_current' => true, 'collapse' => null));
+    }
+    
+    public function getRowUrl($row)
+    {
+        return "";
+    }
+
+}
diff --git a/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Create/Customer/Grid/Renderer/Action.php b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Create/Customer/Grid/Renderer/Action.php
new file mode 100644
index 00000000..c04ce721
--- /dev/null
+++ b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Create/Customer/Grid/Renderer/Action.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright 2015 Zendesk
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+class Zendesk_Zendesk_Block_Adminhtml_Create_Customer_Grid_Renderer_Action extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract
+{
+    public function render(Varien_Object $row)
+    {
+        if ($row->getId()) {
+           return "<button title='".Mage::helper('zendesk')->__('Add')."' type='button' class='scalable' onclick='javascript:insertUser(".$row->getId()."); return false;'><span><span><span>".Mage::helper('zendesk')->__('Add')."</span></span></span></button>";
+        }
+    }
+
+}
diff --git a/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Create/Edit.php b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Create/Edit.php
index 9635985f..fc8b77b2 100644
--- a/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Create/Edit.php
+++ b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Create/Edit.php
@@ -19,8 +19,7 @@ class Zendesk_Zendesk_Block_Adminhtml_Create_Edit extends Mage_Adminhtml_Block_W
 {
     protected function _construct()
     {
-        parent::_construct();
-        $this->_controller = FALSE;
+        parent::_construct(); 
     }
 
     protected function _preparelayout()
diff --git a/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Create/Edit/Form.php b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Create/Edit/Form.php
index 52186a5c..1d81be93 100644
--- a/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Create/Edit/Form.php
+++ b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Create/Edit/Form.php
@@ -105,8 +105,8 @@ protected function _prepareForm()
         
         $fieldset->addField('order', 'text', array(
             'name'     => 'order',
-            'label'    => Mage::helper('zendesk')->__('Order number'),
-            'title'    => Mage::helper('zendesk')->__('Order number'),
+            'label'    => Mage::helper('zendesk')->__('Order Number'),
+            'title'    => Mage::helper('zendesk')->__('Order Number'),
             'required' => false
         ));
 
diff --git a/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Create/Order.php b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Create/Order.php
new file mode 100644
index 00000000..73dcba3f
--- /dev/null
+++ b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Create/Order.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright 2015 Zendesk
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+class Zendesk_Zendesk_Block_Adminhtml_Create_Order extends Mage_Adminhtml_Block_Widget_Form_Container
+{
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->setId('zendesk_create_order_search');
+    }
+
+    public function getHeaderText()
+    {
+        return Mage::helper('zendesk')->__('Please Select Order to Add');
+    }
+    
+    public function getButtonsHtml()
+    {
+        $addButtonData = array(
+            'label' => Mage::helper('zendesk')->__('Select Order'),
+            'onclick' => 'showOrders()',
+            'id'    =>  'show-orders'
+        );
+        return $this->getLayout()->createBlock('adminhtml/widget_button')->setData($addButtonData)->toHtml();
+    }
+
+    public function getHeaderCssClass()
+    {
+        return 'head-catalog-order';
+    }
+
+}
diff --git a/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Create/Order/Grid.php b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Create/Order/Grid.php
new file mode 100644
index 00000000..f37c9b11
--- /dev/null
+++ b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Create/Order/Grid.php
@@ -0,0 +1,141 @@
+<?php
+/**
+ * Copyright 2015 Zendesk
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+class Zendesk_Zendesk_Block_Adminhtml_Create_Order_Grid extends Mage_Adminhtml_Block_Widget_Grid
+{
+
+    public function __construct()
+    {
+        parent::__construct();
+        $this->setId('zendesk_create_order_search_grid');
+        $this->setDefaultSort('entity_id');
+        $this->setUseAjax(true);
+        if ($this->getRequest()->getParam('collapse')) {
+            $this->setIsCollapsed(true);
+        }
+    }
+
+    /**
+     * Retrieve quote store object
+     * @return Mage_Core_Model_Store
+     */
+    public function getStore()
+    {
+        return Mage::getSingleton('adminhtml/session_quote')->getStore();
+    }
+
+    /**
+     * Retrieve collection class
+     *
+     * @return string
+     */
+    protected function _getCollectionClass()
+    {
+        return 'sales/order_grid_collection';
+    }
+
+    protected function _prepareCollection()
+    {
+        $collection = Mage::getResourceModel($this->_getCollectionClass());
+        $this->setCollection($collection);
+        return parent::_prepareCollection();
+    }
+
+    /**
+     * Prepare columns
+     *
+     * @return Mage_Adminhtml_Block_Sales_Order_Create_Search_Grid
+     */
+    protected function _prepareColumns()
+    {
+        $this->addColumn('real_order_id', array(
+            'header'=> Mage::helper('sales')->__('Order #'),
+            'width' => '80px',
+            'type'  => 'text',
+            'index' => 'increment_id',
+        ));
+
+        if (!Mage::app()->isSingleStoreMode()) {
+            $this->addColumn('store_id', array(
+                'header'    => Mage::helper('sales')->__('Purchased From (Store)'),
+                'index'     => 'store_id',
+                'type'      => 'store',
+                'store_view'=> true,
+                'display_deleted' => true,
+            ));
+        }
+
+        $this->addColumn('created_at', array(
+            'header' => Mage::helper('sales')->__('Purchased On'),
+            'index' => 'created_at',
+            'type' => 'datetime',
+            'width' => '100px',
+        ));
+
+        $this->addColumn('billing_name', array(
+            'header' => Mage::helper('sales')->__('Bill to Name'),
+            'index' => 'billing_name',
+        ));
+
+        $this->addColumn('shipping_name', array(
+            'header' => Mage::helper('sales')->__('Ship to Name'),
+            'index' => 'shipping_name',
+        ));
+
+        $this->addColumn('base_grand_total', array(
+            'header' => Mage::helper('sales')->__('G.T. (Base)'),
+            'index' => 'base_grand_total',
+            'type'  => 'currency',
+            'currency' => 'base_currency_code',
+        ));
+
+        $this->addColumn('grand_total', array(
+            'header' => Mage::helper('sales')->__('G.T. (Purchased)'),
+            'index' => 'grand_total',
+            'type'  => 'currency',
+            'currency' => 'order_currency_code',
+        ));
+
+        $this->addColumn('status', array(
+            'header' => Mage::helper('sales')->__('Status'),
+            'index' => 'status',
+            'type'  => 'options',
+            'width' => '70px',
+            'options' => Mage::getSingleton('sales/order_config')->getStatuses(),
+        ));
+
+        $this->addColumn('action', array(
+            'header'    => Mage::helper('zendesk')->__('Action'),
+            'renderer'  => 'zendesk/adminhtml_create_order_grid_renderer_action',
+            'filter'    => false,
+            'sortable'  => false
+        ));
+
+        return parent::_prepareColumns();
+    }
+
+    public function getGridUrl()
+    {
+        return $this->getUrl('adminhtml/zendesk/loadBlock', array('block'=>'order_grid', '_current' => true, 'collapse' => null));
+    }
+    
+    public function getRowUrl($row)
+    {
+        return "";
+    }
+
+}
diff --git a/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Create/Order/Grid/Renderer/Action.php b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Create/Order/Grid/Renderer/Action.php
new file mode 100644
index 00000000..a7a860ca
--- /dev/null
+++ b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Create/Order/Grid/Renderer/Action.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright 2015 Zendesk
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+class Zendesk_Zendesk_Block_Adminhtml_Create_Order_Grid_Renderer_Action extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract
+{
+    public function render(Varien_Object $row)
+    {
+        if ($row->getId()) {
+           return "<button title='".Mage::helper('zendesk')->__('Add')."' type='button' class='scalable' onclick='javascript:insertOrder(".$row->getId()."); return false;'><span><span><span>".Mage::helper('zendesk')->__('Add')."</span></span></span></button>";
+        }
+    }
+
+}
diff --git a/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard.php b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard.php
index f25c8909..06f5d4da 100644
--- a/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard.php
+++ b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright 2012 Zendesk.
  *
@@ -14,24 +15,28 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+class Zendesk_Zendesk_Block_Adminhtml_Dashboard extends Mage_Adminhtml_Block_Template {
 
-class Zendesk_Zendesk_Block_Adminhtml_Dashboard extends Mage_Adminhtml_Block_Template
-{
-
-    public function __construct()
-    {
+    public function __construct() {
         parent::__construct();
+
         $this->setTemplate('zendesk/dashboard/index.phtml');
     }
 
-    public function getIsZendeskDashboard()
-    {
-        $controller = Mage::app()->getFrontController()->getRequest()->getControllerName();
+    public function getIsZendeskDashboard() {
+        return Mage::app()->getFrontController()->getRequest()->getControllerName() === 'zendesk';
+    }
+
+    public function getAuthHeader() {
+        return 'Token token="' . Mage::helper('zendesk')->getApiToken(false) . '"';
+    }
+
+    public function isConnected() {
+        $connection = Mage::helper('zendesk')->getConnectionStatus();
+        return $connection['success'];
+    }
 
-        if($controller == 'zendesk') {
-            return true;
-        } else {
-            return false;
-        }
+    public function getTotals() {
+        return Mage::helper("zendesk")->getTicketTotals();
     }
 }
diff --git a/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard/Grids.php b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard/Grids.php
index f33d786d..de34aebe 100644
--- a/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard/Grids.php
+++ b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard/Grids.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright 2012 Zendesk.
  *
@@ -15,55 +16,84 @@
  * limitations under the License.
  */
 
-class Zendesk_Zendesk_Block_Adminhtml_Dashboard_Grids extends Mage_Adminhtml_Block_Widget_Tabs
-{
-    public function __construct()
-    {
+class Zendesk_Zendesk_Block_Adminhtml_Dashboard_Grids extends Mage_Adminhtml_Block_Widget_Tabs {
+
+    public function __construct() {
         parent::__construct();
+
         $this->setId('tickets_grid_tab');
         $this->setDestElementId('tickets_grid_tab_content');
         $this->setTemplate('widget/tabshoriz.phtml');
     }
-    
-    protected function _prepareLayout()
-    {
+
+    protected function _prepareLayout() {
         // Check if we are on the main admin dashboard and, if so, whether we should be showing the grid
         // Note: an additional check in the template is needed, but this will prevent unnecessary API calls to Zendesk
-        if(!$this->getIsZendeskDashboard() && !Mage::getStoreConfig('zendesk/features/show_on_dashboard')) {
+        if ( !$this->getIsZendeskDashboard() && !Mage::getStoreConfig('zendesk/backend_features/show_on_dashboard') )
+        {
             return parent::_prepareLayout();
         }
 
-        $views = null;
-        $first = true;
+        //check if module is setted up
+        $configured     = (bool) Mage::getStoreConfig('zendesk/general/domain');
+        $viewsIds       = Mage::getStoreConfig('zendesk/backend_features/show_views') ? Mage::helper('zendesk')->getChosenViews() : array(); 
 
-        if(Mage::getStoreConfig('zendesk/features/show_views')) {
-            $list = trim(trim(Mage::getStoreConfig('zendesk/features/show_views')), ',');
-            $views = explode(',', $list);
+        if( Mage::getStoreConfig('zendesk/backend_features/show_all') AND $configured) {
+            $all = array(
+                'class' => 'ajax',
+                'url'   => $this->getUrl('zendesk/adminhtml_zendesk/ticketsAll'),
+            );
+            $label = $this->__("All tickets");
+            
+            $all_count = Mage::registry('zendesk_tickets_all');
+            if (!$all_count) {
+                $this->getLayout()->createBlock('zendesk/adminhtml_dashboard_tab_tickets_grid_all')->toHtml();
+                $all_count = Mage::registry('zendesk_tickets_all');
+            }
+            
+            $label .= " (" . $all_count . ")";
+            
+            $all['label'] = $label;
+            $this->addTab('all-tickets', $all);
         }
 
-        if($views && count($views)) {
-            foreach($views as $viewId) {
-                try {
-                    $view = Mage::getModel('zendesk/api_views')->get($viewId);
-
-                    $tab = array(
-                        'label'     => $this->__($view['title']),
-                        'content'   => $this->getLayout()->createBlock('zendesk/adminhtml_dashboard_tab_view')->setView($view)->toHtml(),
-                    );
+        if(count($viewsIds) AND $configured) {
+            try {
+                $allTicketView = Mage::getModel('zendesk/api_views')->active();
+                $ticketsCounts = Mage::getModel('zendesk/api_views')->countByIds($viewsIds);
 
-                    if($first) {
-                        $tab['active'] = true;
-                        $first = false;
-                    }
-
-                    $this->addTab($viewId, $tab);
+            } catch (Exception $ex) {
+                $allTicketView = array();
+            }
+                
+            foreach($viewsIds as $viewId) {
+                $view = array_shift(array_filter($allTicketView, function($view) use($viewId) {
+                    return $view['id'] === (int) $viewId;
+                }));
+                
+                $count = array_shift(array_filter($ticketsCounts['view_counts'], function($view) use($viewId) {
+                    return $view['view_id'] === (int) $viewId;
+                }));
+                
+                if($count['value']) {
+                    $label = $view['title'] . ' (' . $count['value'] . ')';
+                    $this->addTab($viewId, array(
+                        'label' => $label,
+                        'class' => 'ajax',
+                        'url'   => $this->getUrl('zendesk/adminhtml_zendesk/ticketsView', array('viewid' => $viewId)),
+                    ));
+                } else {
+                    Mage::unregister('zendesk_tickets_view');
+                    Mage::register('zendesk_tickets_view', $viewId);
 
-                } catch(Exception $e) {
-                    // Just don't add the tab
+                    $this->addTab($viewId, array(
+                        'content'   => $this->getLayout()->createBlock('zendesk/adminhtml_dashboard_tab_tickets_grid_view')->toHtml(),
+                        'label'     => $view['title'] . ' (' . Mage::registry('zendesk_tickets_view_'.$viewId) . ')'
+                    ));
                 }
             }
         } else {
-            if($this->getIsZendeskDashboard()) {
+            if ($this->getIsZendeskDashboard() AND !Mage::getStoreConfig('zendesk/backend_features/show_all')) {
                 $block = $this->getLayout()->createBlock('core/template', 'zendesk_dashboard_empty')->setTemplate('zendesk/dashboard/empty.phtml');
                 $this->getLayout()->getBlock('zendesk_dashboard')->append($block);
             }
@@ -71,15 +101,8 @@ protected function _prepareLayout()
 
         return parent::_prepareLayout();
     }
-
-    public function getIsZendeskDashboard()
-    {
-        $controller = Mage::app()->getFrontController()->getRequest()->getControllerName();
-
-        if($controller == 'zendesk') {
-            return true;
-        } else {
-            return false;
-        }
+    
+    public function getIsZendeskDashboard() {
+        return Mage::app()->getFrontController()->getRequest()->getControllerName() === 'zendesk';
     }
 }
diff --git a/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard/Tab/Tickets/Grid/Abstract.php b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard/Tab/Tickets/Grid/Abstract.php
new file mode 100644
index 00000000..80d379cd
--- /dev/null
+++ b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard/Tab/Tickets/Grid/Abstract.php
@@ -0,0 +1,240 @@
+<?php
+
+/**
+ * Copyright 2015 Zendesk
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+abstract class Zendesk_Zendesk_Block_Adminhtml_Dashboard_Tab_Tickets_Grid_Abstract extends Mage_Adminhtml_Block_Widget_Grid {
+    protected $_page;
+    protected $_limit;
+    protected $_viewId;
+    
+    protected $_defaultLimit    = 20;
+    protected $_defaultPage     = 1;
+    protected $_defaultSort     = 'created_at';
+    protected $_defaultDir      = 'desc';
+    
+    protected abstract function _getCollection($collection);
+    
+    protected function _getCollectionModel() {
+        return Mage::getModel('zendesk/resource_tickets_collection');
+    }
+
+    public function setViewId($id = null) {
+        $this->_viewId = (is_null($id) ? uniqid() : $id);
+    }
+
+    public function __construct($attributes = array()) {
+        parent::__construct($attributes);
+        
+        $this->_defaultSort = Mage::getStoreConfig('zendesk/backend_features/default_sort');
+        $this->_defaultDir = Mage::getStoreConfig('zendesk/backend_features/default_sort_dir');
+        
+        $this->setTemplate('zendesk/widget/grid.phtml');
+        
+        $this->_emptyText   = Mage::helper('zendesk')->__('No tickets found');
+    }
+    
+    protected function _construct() {
+        parent::_construct();
+
+        $this->setMassactionBlockName('zendesk/adminhtml_dashboard_tab_tickets_grid_massaction');
+        $this->setId('zendesk_tab_tickets_grid_' . $this->_viewId);
+        $this->setSaveParametersInSession(true);
+        $this->setUseAjax(true);
+        
+        if ($this->getRequest()->getParam('collapse')) {
+            $this->setIsCollapsed(true);
+        }
+        
+        $this->_page    = (int) $this->getParam( $this->getVarNamePage(), $this->_defaultPage);
+        $this->_limit   = (int) $this->getParam( $this->getVarNameLimit(), $this->_defaultLimit);
+    }
+    
+    protected function _preparePage() {
+        parent::_preparePage();
+
+        $this->_page = (int) $this->getParam($this->getVarNamePage(), $this->_defaultPage);
+        $this->_limit = (int) $this->getParam($this->getVarNameLimit(), $this->_defaultLimit);
+    }
+
+    protected function _prepareCollection() {
+        if( ! $this->getCollection() ) {
+            $collection     = $this->_getCollectionModel();
+            $filter         = $this->getParam('filter');
+            $filterData     = Mage::helper('adminhtml')->prepareFilterString($filter);
+
+            foreach($filterData as $fieldName => $value) {
+                $collection->addFieldToFilter($fieldName, $value);
+            }
+
+            $this->setDefaultLimit( $this->getParam('limit', $this->_defaultLimit) );
+            $this->setCollection( $this->_getCollection($collection) );
+        }
+        
+        return parent::_prepareCollection();
+    }
+    
+    protected function _prepareMassaction() {
+        parent::_prepareMassaction();
+
+        $this->setMassactionIdField('id');
+        $this->getMassactionBlock()->setFormFieldName('id');
+        
+        $formKey = Mage::getSingleton('core/session')->getFormKey();
+        
+        $this->getMassactionBlock()->addItem('delete', array(
+            'label'         => Mage::helper('zendesk')->__('Delete'),
+            'url'           => $this->getUrl('*/adminhtml_zendesk/bulkDelete', array('form_key' => $formKey, '_current' => true)),
+            'confirm'       => Mage::helper('zendesk')->__('Are you sure you want to delete selected tickets?')
+        ));
+       
+        $this->getMassactionBlock()->addItem('change_status', array(
+            'label'         => Mage::helper('zendesk')->__('Change Status'),
+            'url'           => $this->getUrl('*/adminhtml_zendesk/bulkChangeStatus', array('form_key' => $formKey, '_current' => true)),
+            'confirm'       => Mage::helper('zendesk')->__('Are you sure you want to change status of selected tickets?'),
+            'additional'    => array(
+                'visibility'    => array(
+                    'name'          => 'status',
+                    'type'          => 'select',
+                    'class'         => 'required-entry',
+                    'label'         => Mage::helper('zendesk')->__('Status'),
+                    'values'        => Mage::helper('zendesk')->getStatusMap()
+                )
+            )
+        ));
+        
+        $this->getMassactionBlock()->addItem('change_priority', array(
+            'label'         => Mage::helper('zendesk')->__('Change Priority'),
+            'url'           => $this->getUrl('*/adminhtml_zendesk/bulkChangePriority', array('form_key' => $formKey, '_current' => true)),
+            'confirm'       => Mage::helper('zendesk')->__('Are you sure you want to change priority of selected tickets?'),
+            'additional'    => array(
+                'visibility'    => array(
+                    'name'          => 'priority',
+                    'type'          => 'select',
+                    'class'         => 'required-entry',
+                    'label'         => Mage::helper('zendesk')->__('Priority'),
+                    'values'        => Mage::helper('zendesk')->getPriorityMap()
+                )
+            )
+        ));
+        
+        $this->getMassactionBlock()->addItem('change_type', array(
+            'label'         => Mage::helper('zendesk')->__('Change Type'),
+            'url'           => $this->getUrl('*/adminhtml_zendesk/bulkChangeType', array('form_key' => $formKey, '_current' => true)),
+            'confirm'       => Mage::helper('zendesk')->__('Are you sure you want to change type of selected tickets?'),
+            'additional'    => array(
+                'visibility'    => array(
+                    'name'          => 'type',
+                    'type'          => 'select',
+                    'class'         => 'required-entry',
+                    'label'         => Mage::helper('zendesk')->__('Type'),
+                    'values'        => Mage::helper('zendesk')->getTypeMap()
+                )
+            )
+        ));
+        
+        $this->getMassactionBlock()->addItem('mark_as_spam', array(
+            'label'         => Mage::helper('zendesk')->__('Mark as Spam'),
+            'url'           => $this->getUrl('*/adminhtml_zendesk/bulkMarkSpam', array('form_key' => $formKey, '_current' => true)),
+            'confirm'       => Mage::helper('zendesk')->__('Are you sure you want to mark as spam selected tickets?'),
+        ));
+        
+        return $this;
+    }
+    
+    protected function getNoFilterMassactionColumn(){
+        return true;
+    }
+    
+    protected function addColumnBasedOnType($index, $title, $filter = false, $sortable = true) {
+        $column = array(
+            'header'    => Mage::helper('zendesk')->__($title),
+            'sortable'  => $sortable,
+            'filter'    => $filter,
+            'index'     => $index,
+            'type'      => $this->getColumnType($index),
+        );
+        
+        $renderer = $this->getColumnRenderer($index);
+        
+        if($renderer !== null) {
+            $column['renderer'] = $renderer;
+        }
+        
+        $this->addColumn($index, $column);
+    }
+    
+    protected function getColumnType($index) {
+        switch($index) {
+            case 'created_at':
+            case 'created':
+            case 'requested':
+            case 'updated_at':
+            case 'updated':
+                return 'datetime';
+            default:
+                return 'text';
+        }
+    }
+    
+    protected function getColumnRenderer($index) {
+        switch($index) {
+            case 'requester':
+            case 'assignee':
+                return 'zendesk/adminhtml_dashboard_tab_tickets_grid_renderer_user';
+            case 'subject':
+                return 'zendesk/adminhtml_dashboard_tab_tickets_grid_renderer_action';
+            case 'group':
+                return 'zendesk/adminhtml_dashboard_tab_tickets_grid_renderer_group';
+            default:
+                return null;
+        }
+    }
+    
+    protected function getGridParams() {
+        return array(
+            'page'          => $this->_page,
+            'per_page'      => $this->_limit,
+            'sort_order'    => $this->getParam( $this->getVarNameDir(), $this->_defaultDir),
+            'sort_by'       => $this->getParam( $this->getVarNameSort(), $this->_defaultSort),
+        );
+    }
+    
+    public function getGridJavascript()
+    {
+        $js = $this->getJsObjectName()."= new varienGrid('".$this->getId()."', '".$this->getGridUrl()."', '".$this->getVarNamePage()."', '".$this->getVarNameSort()."', '".$this->getVarNameDir()."', '".$this->getVarNameFilter()."');";
+        $js .= $this->getJsObjectName() .".useAjax = '".$this->getUseAjax()."';";
+        
+        if($this->getRowClickCallback())
+            $js .= $this->getJsObjectName() .".rowClickCallback = ".$this->getRowClickCallback().";";
+  
+        if($this->getCheckboxCheckCallback())
+            $js .= $this->getJsObjectName().".checkboxCheckCallback = ".$this->getCheckboxCheckCallback().";";
+        
+        if($this->getRowInitCallback()) {
+            $js .= $this->getJsObjectName().".initRowCallback = ".$this->getRowInitCallback().";";
+            $js .= $this->getJsObjectName().".initGridRows();";
+        }
+        
+        if($this->getMassactionBlock()->isAvailable())
+            $js .= $this->getMassactionBlock()->getJavaScript();
+        
+        $js .= $this->getAdditionalJavaScript();
+        
+        return $js;
+    }
+    
+}
diff --git a/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard/Tab/Tickets/Grid/All.php b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard/Tab/Tickets/Grid/All.php
new file mode 100644
index 00000000..d2a4b95a
--- /dev/null
+++ b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard/Tab/Tickets/Grid/All.php
@@ -0,0 +1,106 @@
+<?php
+
+/**
+ * Copyright 2015 Zendesk
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+class Zendesk_Zendesk_Block_Adminhtml_Dashboard_Tab_Tickets_Grid_All extends Zendesk_Zendesk_Block_Adminhtml_Dashboard_Tab_Tickets_Grid_Abstract {
+
+    public function __construct($attributes = array()) {
+        $this->setViewId('all');
+
+        parent::__construct($attributes);
+    }
+
+    protected function _getCollection($collection) {
+        return $collection->getCollection($this->getGridParams());
+    }
+
+    public function getGridUrl() {
+        return $this->getUrl('*/*/ticketsAll', array('_current' => true));
+    }
+
+    protected function _prepareColumns() {
+        $this->addColumn('id', array(
+            'header'    => Mage::helper('zendesk')->__('Ticket ID'),
+            'sortable'  => false,
+            'align'     => 'right',
+            'width'     => '30px',
+            'index'     => 'id',
+        ));
+
+        $this->addColumn('subject', array(
+            'header'    => Mage::helper('zendesk')->__('Subject'),
+            'sortable'  => false,
+            'index'     => 'description',
+            'type'      => 'text',
+            'renderer'  => 'zendesk/adminhtml_dashboard_tab_tickets_grid_renderer_action',
+        ));
+
+        $this->addColumn('requester_id', array(
+            'header'    => Mage::helper('zendesk')->__('Email'),
+            'width'     => '60',
+            'renderer'  => 'zendesk/adminhtml_dashboard_tab_tickets_grid_renderer_email',
+            'index'     => 'requester_id',
+            'sortable'  => false,
+        ));
+
+        $this->addColumn('type', array(
+            'header'    => Mage::helper('zendesk')->__('Type'),
+            'width'     => '100',
+            'type'      => 'options',
+            'options'   => Mage::helper('zendesk')->getTypeMap(),
+            'index'     => 'type',
+            'sortable'  => false,
+        ));
+
+        $this->addColumn('status', array(
+            'header'    => Mage::helper('zendesk')->__('Status'),
+            'sortable'  => true,
+            'width'     => '100px',
+            'index'     => 'status',
+            'type'      => 'options',
+            'options'   => Mage::helper('zendesk')->getStatusMap(),
+        ));
+
+        $this->addColumn('priority', array(
+            'header'    => Mage::helper('zendesk')->__('Priority'),
+            'sortable'  => true,
+            'width'     => '100px',
+            'index'     => 'priority',
+            'type'      => 'options',
+            'options'   => Mage::helper('zendesk')->getPriorityMap(),
+        ));
+
+        $this->addColumn('created_at', array(
+            'header'    => Mage::helper('zendesk')->__('Requested'),
+            'sortable'  => true,
+            'width'     => '160px',
+            'index'     => 'created_at',
+            'type'      => 'datetime',
+        ));
+
+        $this->addColumn('updated_at', array(
+            'header'    => Mage::helper('zendesk')->__('Updated'),
+            'sortable'  => true,
+            'width'     => '160px',
+            'index'     => 'updated_at',
+            'type'      => 'datetime',
+        ));
+
+        return parent::_prepareColumns();
+    }
+
+}
diff --git a/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard/Tab/Tickets/Grid/Massaction.php b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard/Tab/Tickets/Grid/Massaction.php
new file mode 100644
index 00000000..e9e39026
--- /dev/null
+++ b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard/Tab/Tickets/Grid/Massaction.php
@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * Copyright 2015 Zendesk
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+class Zendesk_Zendesk_Block_Adminhtml_Dashboard_Tab_Tickets_Grid_Massaction extends Mage_Adminhtml_Block_Widget_Grid_Massaction {
+
+    public function getJavaScript() {
+        return " {$this->getJsObjectName()} = new varienGridMassaction('{$this->getHtmlId()}', "
+                . "{$this->getGridJsObjectName()}, '{$this->getSelectedJson()}'"
+                . ", '{$this->getFormFieldNameInternal()}', '{$this->getFormFieldName()}');"
+                . "{$this->getJsObjectName()}.setItems({$this->getItemsJson()}); "
+                . "{$this->getJsObjectName()}.setGridIds('{$this->getGridIdsJson()}');"
+                . ($this->getUseAjax() ? "{$this->getJsObjectName()}.setUseAjax(true);" : '')
+                . ($this->getUseSelectAll() ? "{$this->getJsObjectName()}.setUseSelectAll(true);" : '')
+                . "{$this->getJsObjectName()}.errorText = '{$this->getErrorText()}';";
+    }
+
+}
diff --git a/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard/Tab/Tickets/Grid/Renderer/Action.php b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard/Tab/Tickets/Grid/Renderer/Action.php
new file mode 100644
index 00000000..6d32df7d
--- /dev/null
+++ b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard/Tab/Tickets/Grid/Renderer/Action.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * Copyright 2013 Zendesk.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+class Zendesk_Zendesk_Block_Adminhtml_Dashboard_Tab_Tickets_Grid_Renderer_Action extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract {
+
+    public function render(Varien_Object $row) {
+        return Mage::helper('zendesk')->getTicketUrl($row->getData());
+    }
+
+}
diff --git a/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard/Tab/Tickets/Grid/Renderer/Email.php b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard/Tab/Tickets/Grid/Renderer/Email.php
new file mode 100644
index 00000000..3f9178a3
--- /dev/null
+++ b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard/Tab/Tickets/Grid/Renderer/Email.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * Copyright 2013 Zendesk.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+class Zendesk_Zendesk_Block_Adminhtml_Dashboard_Tab_Tickets_Grid_Renderer_Email extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract {
+
+    public function render(Varien_Object $row) {
+        $users = Mage::registry('zendesk_users');
+        $value = (int) $row->getData($this->getColumn()->getIndex());
+        
+        $found = array_filter($users, function($user) use($value) {
+            return (int) $user['id'] === $value;
+        });
+        
+        if( count($found) ) {
+            $user = array_shift($found);
+            
+            return $user['email'];
+        }
+        
+        return '';
+    }
+
+}
diff --git a/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard/Tab/Tickets/Grid/Renderer/Group.php b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard/Tab/Tickets/Grid/Renderer/Group.php
new file mode 100644
index 00000000..1100d534
--- /dev/null
+++ b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard/Tab/Tickets/Grid/Renderer/Group.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * Copyright 2013 Zendesk.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+class Zendesk_Zendesk_Block_Adminhtml_Dashboard_Tab_Tickets_Grid_Renderer_Group extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract {
+
+    public function render(Varien_Object $row) {
+        $groups = Mage::registry('zendesk_groups');
+        $value  = (int) $row->getData($this->getColumn()->getIndex());
+        
+        $found = array_filter($groups, function($group) use($value) {
+            return (int) $group['id'] === $value;
+        });
+        
+        if( count($found) ) {
+            $group = array_shift($found);
+            
+            return $group['name'];
+        }
+        
+        return '';
+    }
+
+}
diff --git a/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard/Tab/Tickets/Grid/Renderer/Type.php b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard/Tab/Tickets/Grid/Renderer/Type.php
new file mode 100644
index 00000000..111a7905
--- /dev/null
+++ b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard/Tab/Tickets/Grid/Renderer/Type.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * Copyright 2013 Zendesk.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+class Zendesk_Zendesk_Block_Adminhtml_Dashboard_Tab_Tickets_Grid_Renderer_Type extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract {
+
+    public function render(Varien_Object $row) {
+        return ucfirst($row['type']);
+    }
+
+}
diff --git a/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard/Tab/Tickets/Grid/Renderer/User.php b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard/Tab/Tickets/Grid/Renderer/User.php
new file mode 100644
index 00000000..09e4c775
--- /dev/null
+++ b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard/Tab/Tickets/Grid/Renderer/User.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * Copyright 2013 Zendesk.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+class Zendesk_Zendesk_Block_Adminhtml_Dashboard_Tab_Tickets_Grid_Renderer_User extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract {
+
+    public function render(Varien_Object $row) {
+        $users = Mage::registry('zendesk_users');
+        $value = (int) $row->getData($this->getColumn()->getIndex());
+        
+        $found = array_filter($users, function($user) use($value) {
+            return (int) $user['id'] === $value;
+        });
+        
+        if( count($found) ) {
+            $user = array_shift($found);
+            
+            return $user['name'];
+        }
+        
+        return '';
+    }
+
+}
diff --git a/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard/Tab/Tickets/Grid/View.php b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard/Tab/Tickets/Grid/View.php
new file mode 100644
index 00000000..1ad70a7b
--- /dev/null
+++ b/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard/Tab/Tickets/Grid/View.php
@@ -0,0 +1,65 @@
+<?php
+
+/**
+ * Copyright 2015 Zendesk
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+class Zendesk_Zendesk_Block_Adminhtml_Dashboard_Tab_Tickets_Grid_View extends Zendesk_Zendesk_Block_Adminhtml_Dashboard_Tab_Tickets_Grid_Abstract {
+    
+    public function __construct($attributes = array()) {
+        $viewId = Mage::registry('zendesk_tickets_view');
+        $this->setViewId($viewId);
+        
+        parent::__construct($attributes);
+    }
+    
+    protected function _getCollection($collection) {
+        return $collection->getCollectionFromView($this->_viewId, $this->getGridParams());
+    }
+    
+    public function getGridUrl() {
+        return $this->getUrl('*/*/ticketsView', array('_current' => true));
+    }
+    
+    protected function _prepareGrid() {
+        parent::_prepareGrid();
+        $this->_prepareDynamicColumns();
+        $this->_prepareCollection();
+        
+        return $this;
+    }
+    
+    protected function _prepareColumns() {
+        $this->addColumn('id', array(
+            'header'    => Mage::helper('zendesk')->__('Ticket ID'),
+            'sortable'  => true,
+            'filter'    => false,
+            'align'     => 'right',
+            'width'     => '30px',
+            'index'     => 'id',
+        ));
+
+        return parent::_prepareColumns();
+    }
+    
+    protected function _prepareDynamicColumns() {
+        $viewColumns = $this->getCollection()->getColumnsForView();
+        
+        foreach($viewColumns as $column) {
+            $this->addColumnBasedOnType($column['id'], $column['title']);
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/src/app/code/community/Zendesk/Zendesk/Block/Customer/Tickets.php b/src/app/code/community/Zendesk/Zendesk/Block/Customer/Tickets.php
index 49110c1f..51500882 100644
--- a/src/app/code/community/Zendesk/Zendesk/Block/Customer/Tickets.php
+++ b/src/app/code/community/Zendesk/Zendesk/Block/Customer/Tickets.php
@@ -22,4 +22,9 @@ public function __construct()
         parent::__construct();
         $this->setTemplate('zendesk/customer/tickets.phtml');
     }
-}
\ No newline at end of file
+    
+    public function getSubmitAction() {
+        $url = Mage::helper('adminhtml')->getUrl('*/sso/login', array("return_url" => Mage::helper('core')->urlEncode("http://".Mage::getStoreConfig('zendesk/general/domain')."/requests/new")));
+        return $url;
+    }
+}
diff --git a/src/app/code/community/Zendesk/Zendesk/Block/Customer/Tickets/List.php b/src/app/code/community/Zendesk/Zendesk/Block/Customer/Tickets/List.php
index 32a87b58..3bb17c06 100644
--- a/src/app/code/community/Zendesk/Zendesk/Block/Customer/Tickets/List.php
+++ b/src/app/code/community/Zendesk/Zendesk/Block/Customer/Tickets/List.php
@@ -61,7 +61,7 @@ public function getList()
         $customer = $this->getCustomer();
         $tickets = null;
 
-        if($customer) {
+        if($customer && $customer->getEmail()) {
             $tickets = Mage::getModel('zendesk/api_tickets')->forRequester($customer->getEmail());
         }
 
diff --git a/src/app/code/community/Zendesk/Zendesk/Block/Supporttab.php b/src/app/code/community/Zendesk/Zendesk/Block/Supporttab.php
index c7f80fdf..20d93972 100644
--- a/src/app/code/community/Zendesk/Zendesk/Block/Supporttab.php
+++ b/src/app/code/community/Zendesk/Zendesk/Block/Supporttab.php
@@ -19,10 +19,10 @@ class Zendesk_Zendesk_Block_Supporttab extends Mage_Core_Block_Template
 {
     protected function _toHtml()
     {
-        if(!Mage::getStoreConfig('zendesk/features/feedback_tab_code_active')) {
+        if(!Mage::getStoreConfig('zendesk/frontend_features/feedback_tab_code_active')) {
             return '';
         }
 
-        return Mage::getStoreConfig('zendesk/features/feedback_tab_code');
+        return Mage::getStoreConfig('zendesk/frontend_features/feedback_tab_code');
     }
-}
\ No newline at end of file
+}
diff --git a/src/app/code/community/Zendesk/Zendesk/Helper/Data.php b/src/app/code/community/Zendesk/Zendesk/Helper/Data.php
index e7f7e662..051c574e 100644
--- a/src/app/code/community/Zendesk/Zendesk/Helper/Data.php
+++ b/src/app/code/community/Zendesk/Zendesk/Helper/Data.php
@@ -25,7 +25,7 @@ public function getUrl($object = '', $id = null, $format = 'old')
         $root = ($format === 'old') ? '' : '/agent/#';
 
         $base = $protocol . $domain . $root;
-
+       
         switch($object) {
             case '':
                 return $base;
@@ -45,6 +45,86 @@ public function getUrl($object = '', $id = null, $format = 'old')
         }
     }
 
+    /**
+     * Returns configured Zendesk Domain
+     * format: company.zendesk.com
+     *
+     * @return mixed Zendesk Account Domain
+     */
+    public function getZendeskDomain()
+    {
+        return Mage::getStoreConfig('zendesk/general/domain');
+    }
+    
+    
+    /**
+     * Returns if SSO is enabled for EndUsers
+     * @return integer
+     */
+    public function isSSOEndUsersEnabled()
+    {
+        return Mage::getStoreConfig('zendesk/sso_frontend/enabled');
+    }
+
+    /**
+     * Returns if SSO is enabled for Admin/Agent Users
+     * @return integer
+     */
+    public function isSSOAdminUsersEnabled()
+    {
+        return Mage::getStoreConfig('zendesk/sso/enabled');
+    }
+
+    /**
+     * Returns frontend URL where authentication process starts for EndUsers
+     *
+     * @return string SSO Url to auth EndUsers
+     */
+    public function getSSOAuthUrlEndUsers()
+    {
+        return Mage::getUrl('zendesk/sso/login');
+    }
+
+    /**
+     * Returns backend URL where authentication process starts for Admin/Agents
+     *
+     * @return string SSO Url to auth Admin/Agents
+     */
+    public function getSSOAuthUrlAdminUsers()
+    {
+        return Mage::helper('adminhtml')->getUrl('*/zendesk/login');
+    }
+
+    /**
+     * Returns Zendesk Account Login URL for normal access
+     * format: https://<zendesk_account>/<route>
+     *
+     * @return string Zendesk Account login url
+     */
+    public function getZendeskAuthNormalUrl()
+    {
+        $protocol = 'https://';
+        $domain = $this->getZendeskDomain();
+        $route = '/access/normal';
+
+        return $protocol . $domain . $route;
+    }
+
+    /**
+     * Returns Zendesk Login Form unauthenticated URL
+     * format: https://<zendesk_account>/<route>
+     *
+     * @return string Zendesk Account login unauthenticated form url
+     */
+    public function getZendeskUnauthUrl()
+    {
+        $protocol = 'https://';
+        $domain = $this->getZendeskDomain();
+        $route = '/access/unauthenticated';
+
+        return $protocol . $domain . $route;
+    }
+    
     public function getApiToken($generate = true)
     {
         // Grab any existing token from the admin scope
@@ -188,4 +268,104 @@ public function isExternalIdEnabled()
     {
         return Mage::getStoreConfig('zendesk/general/use_external_id');
     }
+
+    public function getTicketUrl($row, $link = false)
+    {   
+        $path = Mage::getSingleton('admin/session')->getUser() ? 'adminhtml/zendesk/login' : '*/sso/login';
+        $url = Mage::helper('adminhtml')->getUrl($path, array("return_url" => Mage::helper('core')->urlEncode(Mage::helper('zendesk')->getUrl('ticket', $row['id']))));
+        
+        if ($link)
+            return $url;
+        
+        $subject = $row['subject'] ? $row['subject'] : $this->__('No Subject');
+
+        return '<a href="' . $url . '" target="_blank">' .  $subject. '</a>';
+    }
+    
+    public function getStatusMap()
+    {
+        return array(
+            'new'       =>  'New',
+            'open'      =>  'Open',
+            'pending'   =>  'Pending',
+            'solved'    =>  'Solved',
+            'closed'    =>  'Closed',
+            'hold'      =>  'Hold'
+        );
+    }
+        
+    public function getPriorityMap()
+    {
+        return array(
+            'low'       =>  'Low',
+            'normal'    =>  'Normal',
+            'high'      =>  'High',
+            'urgent'    =>  'Urgent'
+        );
+    }
+    
+    public function getTypeMap()
+    {
+        return array(
+            'problem'   =>  'Problem',
+            'incident'  =>  'Incident',
+            'question'  =>  'Question',
+            'task'      =>  'Task'
+        );
+    }
+    
+    public function getChosenViews() {
+        $list = trim(trim(Mage::getStoreConfig('zendesk/backend_features/show_views')), ',');
+        return explode(',', $list);
+    }
+    
+    public function getFormatedDataForAPI($dateToFormat) {
+        $myDateTime = DateTime::createFromFormat('d/m/Y', $dateToFormat);
+        return $myDateTime->format('Y-m-d');
+    }
+    
+    public function isValidDate($date) {
+        if(is_string($date)) {
+            $d = DateTime::createFromFormat('d/m/Y', $date);
+            return $d && $d->format('d/m/Y') == $date;
+        }
+        
+        return false;
+    }
+    
+    public function getFormatedDateTime($dateToFormat) {
+        return Mage::helper('core')->formatDate($dateToFormat, 'medium', true);
+    }
+    
+    public function getConnectionStatus() {
+        try {
+            $user = Mage::getModel('zendesk/api_users')->me();
+            
+            if($user['id']) {
+                return array(
+                    'success'   => true,
+                    'msg'       => Mage::helper('zendesk')->__('Connection to Zendesk API successful'),
+                );
+            }
+            
+            $error = Mage::helper('zendesk')->__('Connection to Zendesk API failed') .
+                '<br />' . Mage::helper('zendesk')->__('Troubleshooting tips can be found at <a href=%s>%s</a>', 'https://support.zendesk.com/entries/26579987', 'https://support.zendesk.com/entries/26579987');
+            
+            return array(
+                'success'   => false,
+                'msg'       => $error,
+            );
+            
+        } catch (Exception $ex) {
+            $error = Mage::helper('zendesk')->__('Connection to Zendesk API failed') .
+                '<br />' . $ex->getCode() . ': ' . $ex->getMessage() .
+                '<br />' . Mage::helper('zendesk')->__('Troubleshooting tips can be found at <a href=%s>%s</a>', 'https://support.zendesk.com/entries/26579987', 'https://support.zendesk.com/entries/26579987');
+            
+            return array(
+                'success'   => false,
+                'msg'       => $error,
+            );
+        }
+    }
+    
 }
diff --git a/src/app/code/community/Zendesk/Zendesk/Model/Api/Abstract.php b/src/app/code/community/Zendesk/Zendesk/Model/Api/Abstract.php
index 8861c039..9a9698c3 100644
--- a/src/app/code/community/Zendesk/Zendesk/Model/Api/Abstract.php
+++ b/src/app/code/community/Zendesk/Zendesk/Model/Api/Abstract.php
@@ -24,16 +24,8 @@ protected function _getUrl($path)
         return $base_url . '/' . $path;
     }
 
-    protected function _call(
-        $endpoint, 
-        $params = null, 
-        $method = 'GET', 
-        $data = null, 
-        $headers = null
-    )
+    protected function _call($endpoint, $params = null, $method = 'GET', $data = null, $silent = false, $global = false)
     {
-        $usingRawData = false;
-
         if($params && is_array($params) && count($params) > 0) {
             $args = array();
             foreach($params as $arg => $val) {
@@ -41,37 +33,27 @@ protected function _call(
             }
             $endpoint .= '?' . implode('&', $args);
         }
-
-        if (empty($headers)) {
-            $headers = array(
-                 'Accept'       => 'application/json',
-                 'Content-Type' => 'application/json',
-            );
-        }
-
+        
         $url = $this->_getUrl($endpoint);
 
         $method = strtoupper($method);
 
         $client = new Zend_Http_Client($url);
         $client->setMethod($method);
-        $client->setHeaders($headers);
+        $client->setHeaders(
+            array(
+                 'Accept' => 'application/json',
+                 'Content-Type' => 'application/json'
+            )
+        );
 
         $client->setAuth(
-            Mage::getStoreConfig('zendesk/general/email') . '/token',
+            Mage::getStoreConfig('zendesk/general/email'). '/token',
             Mage::getStoreConfig('zendesk/general/password')
         );
 
-        if($method == 'POST' || $method == 'PUT') {
-            $contentType = $client->getHeader('Content-Type');
-
-            if ($contentType == 'application/json' && !preg_match('/^[\{\[]/', $contentType)) {
-                $data = json_encode($data);
-            }
-
-            $client->setRawData($data, $client->getHeader('Content-Type'));
-
-            $usingRawData = true;
+        if($method == 'POST' || $method == "PUT") {
+            $client->setRawData(json_encode($data), 'application/json');
         }
 
         Mage::log(
@@ -79,15 +61,20 @@ protected function _call(
                 array(
                    'url' => $url,
                    'method' => $method,
-                   'data' => $usingRawData ? '' : json_encode($data),
+                   'data' => json_encode($data),
                 ),
                 true
             ),
             null,
             'zendesk.log'
         );
-
-        $response = $client->request();
+        
+        try {
+            $response = $client->request();
+        } catch ( Exception $ex ) {
+            return array();
+        }
+        
         $body = json_decode($response->getBody(), true);
 
         Mage::log(var_export($body, true), null, 'zendesk.log');
@@ -95,12 +82,27 @@ protected function _call(
         if($response->isError()) {
             if(is_array($body) && isset($body['error'])) {
                 if(is_array($body['error']) && isset($body['error']['title'])) {
-                    throw new Exception($body['error']['title'], $response->getStatus());
+                    if (!$silent) {
+                        Mage::getSingleton('adminhtml/session')->addError(Mage::helper('zendesk')->__($body['error']['title'],$response->getStatus()));
+                        return;
+                    } else {
+                        return $body;
+                    }
                 } else {
-                    throw new Exception($body['error'], $response->getStatus());
+                    if (!$silent) {
+                        Mage::getSingleton('adminhtml/session')->addError(Mage::helper('zendesk')->__($body['error'],$response->getStatus()));
+                        return;
+                    } else {
+                        return $body;
+                    }
                 }
             } else {
-                throw new Exception($body, $response->getStatus());
+                if (!$silent) {
+                    Mage::getSingleton('adminhtml/session')->addError(Mage::helper('zendesk')->__($body, $response->getStatus()));
+                    return;
+                } else {
+                    return $body;
+                }
             }
         }
 
diff --git a/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard/Tab/View.php b/src/app/code/community/Zendesk/Zendesk/Model/Api/Groups.php
similarity index 55%
rename from src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard/Tab/View.php
rename to src/app/code/community/Zendesk/Zendesk/Model/Api/Groups.php
index 37e0df57..d70c239d 100644
--- a/src/app/code/community/Zendesk/Zendesk/Block/Adminhtml/Dashboard/Tab/View.php
+++ b/src/app/code/community/Zendesk/Zendesk/Model/Api/Groups.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright 2012 Zendesk.
  *
@@ -14,27 +15,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+class Zendesk_Zendesk_Model_Api_Groups extends Zendesk_Zendesk_Model_Api_Abstract {
 
-class Zendesk_Zendesk_Block_Adminhtml_Dashboard_Tab_View extends Mage_Adminhtml_Block_Widget_Container
-{
-    protected $_view = null;
-
-    public function setView($view)
-    {
-        $this->_view = $view;
-        $this->setId('view-' . $view['id']);
+    public function all() {
+        $page = 1;
+        $groups = array();
 
-        return $this;
-    }
+        while ($page) {
+            $response   = $this->_call('groups.json?page=' . $page);
+            $groups     = array_merge($groups, $response['groups']);
+            $page       = is_null($response['next_page']) ? 0 : $page + 1;
+        }
 
-    public function getView()
-    {
-        return $this->_view;
+        return $groups;
     }
 
-    public function __construct()
-    {
-        parent::__construct();
-        $this->setTemplate('zendesk/dashboard/tabs/view.phtml');
-    }
 }
diff --git a/src/app/code/community/Zendesk/Zendesk/Model/Api/Tickets.php b/src/app/code/community/Zendesk/Zendesk/Model/Api/Tickets.php
index 90238cd2..1392a689 100644
--- a/src/app/code/community/Zendesk/Zendesk/Model/Api/Tickets.php
+++ b/src/app/code/community/Zendesk/Zendesk/Model/Api/Tickets.php
@@ -87,6 +87,17 @@ public function recent()
         return $response['tickets'];
     }
 
+    public function all()
+    {
+        $response = $this->_call('tickets.json');
+        return $response['tickets'];
+    }
+    
+    public function search($data)
+    {
+        return $this->_call('search.json', $data);
+    }
+        
     public function forOrder($orderIncrementId)
     {
         if(!$orderIncrementId) {
@@ -103,7 +114,7 @@ public function forOrder($orderIncrementId)
 
         // Now check through the tickets to make sure the appropriate field has been filled out with the order number
         $tickets = array();
-        $fieldId = Mage::getStoreConfig('zendesk/features/order_field_id');
+        $fieldId = Mage::getStoreConfig('zendesk/frontend_features/order_field_id');
 
         if(!$fieldId) {
             return false;
@@ -132,25 +143,51 @@ public function forOrder($orderIncrementId)
 
     public function forRequester($customerEmail)
     {
-        if(!$customerEmail || strlen(trim($customerEmail)) === 0) {
-            throw new InvalidArgumentException('Customer email address not valid');
+        $user = Mage::getModel('zendesk/api_users')->find($customerEmail);
+        if(isset($user['id'])) {
+            $response = $this->_call('users/' . $user['id'] . '/requests.json', null, 'GET', null, false);
+            return $response['requests'];
+        } else {
+            return array();
         }
-
-        $response = $this->_call('search.json',
-            array(
-                 'query' => 'requester:' . $customerEmail . ' type:ticket',
-                 'sort_order' => 'desc',
-                 'sort_by' => 'updated_at',
-            )
-        );
-
-        return $response['results'];
     }
-
+    
+    public function bulkDelete($data)
+    {
+        if (is_array($data)) {
+            $params['ids'] = implode(",",$data);
+            return $this->_call('tickets/destroy_many.json', $params, 'DELETE');
+        }
+    }
+    
+    public function updateMany($ids, $data) {
+        if(is_array($ids)) {
+            $params['ids'] = implode(",", $ids);
+            $ticket['ticket'] = $data;
+            
+            return $this->_call('tickets/update_many.json', $params, 'PUT', $ticket);
+        }
+    }
+    
+    public function getJobStatus($url)
+    {
+        $parts = explode("/", $url);
+        $link =  'job_statuses/'.end($parts);
+        return $this->_call($link);
+    }
+    
+    public function bulkMarkAsSpam($data)
+    {
+        if (is_array($data)) {
+            $params['ids'] = implode(",",$data);
+            return $this->_call('tickets/mark_many_as_spam.json', $params, 'PUT');
+        }
+    }
+    
     public function create($data)
     {
         $response = $this->_call('tickets.json', null, 'POST', $data);
-
+        
         return $response['ticket'];
     }
 
diff --git a/src/app/code/community/Zendesk/Zendesk/Model/Api/Users.php b/src/app/code/community/Zendesk/Zendesk/Model/Api/Users.php
index 9e944fd7..6aa3f4a7 100644
--- a/src/app/code/community/Zendesk/Zendesk/Model/Api/Users.php
+++ b/src/app/code/community/Zendesk/Zendesk/Model/Api/Users.php
@@ -33,6 +33,13 @@ public function find($email)
         }
     }
 
+    public function me()
+    {
+        $response = $this->_call('users/me.json');
+
+        return $response['user'];
+    }
+
     public function get($id)
     {
         if(!Zend_Validate::is($id, 'NotEmpty')) {
@@ -46,7 +53,62 @@ public function get($id)
 
     public function all()
     {
-        $response = $this->_call('users.json');
-        return $response['users'];
+        $page = 1;
+        $users = array();
+        
+        while($page) {
+            $response   = $this->_call('users.json?page=' . $page);
+            $users      = array_merge($users, $response['users']);
+            $page       = is_null($response['next_page']) ? 0 : $page + 1;
+    }
+    
+        return $users;
+    }
+    
+    public function end($id)
+    {
+        if(!Zend_Validate::is($id, 'NotEmpty')) {
+            throw new InvalidArgumentException('No ID value provided');
+        }
+        
+        $response = $this->_call('end_users/'. $id .'.json');
+        
+        return $response['user'];
+    }
+    
+    public function getIdentities($id)
+    {
+        $response = $this->_call('users/' . $id . '/identities.json');
+        return $response['identities'];
+    }
+    
+    public function setPrimaryIdentity($user_id, $identity_id)
+    {
+        $response = $this->_call('users/' . $user_id . '/identities/'.$identity_id.'/make_primary.json', null, 'PUT', null, true);
+        return $response['identities'];
+    }
+    
+    public function addIdentity($user_id, $data)
+    {
+        $response = $this->_call('users/' . $user_id . '/identities.json', null, 'POST', $data, true);
+        return $response['identity'];
+    }
+    
+    public function update($user_id, $user)
+    {
+        $response = $this->_call('users/' . $user_id . '.json', null, 'PUT', $user, true);
+        return $response['user'];
+    }
+    
+    public function create($user)
+    {
+        $response = $this->_call('users.json', null, 'POST', $user, true);
+        return $response['user'];
+    }
+    
+    public function createUserField($field)
+    {
+        $response = $this->_call('user_fields.json', null, 'POST', $field, true);
+        return $response['user_field'];
     }
 }
\ No newline at end of file
diff --git a/src/app/code/community/Zendesk/Zendesk/Model/Api/Views.php b/src/app/code/community/Zendesk/Zendesk/Model/Api/Views.php
index cf5e657d..df0c7c9f 100644
--- a/src/app/code/community/Zendesk/Zendesk/Model/Api/Views.php
+++ b/src/app/code/community/Zendesk/Zendesk/Model/Api/Views.php
@@ -33,13 +33,25 @@ public function get($id)
         return $response['view'];
     }
 
-    public function execute($id)
+    public function execute($id, array $params = array())
     {
         if(!Zend_Validate::is($id, 'NotEmpty')) {
             throw new InvalidArgumentException('View ID not provided');
         }
 
-        $response = $this->_call('views/' . $id . '/execute.json');
+        $paramsString = count($params) ? '?' . http_build_query($params) : '';
+
+        $response = $this->_call('views/' . $id . '/execute.json' . $paramsString);
+        return $response;
+    }
+    
+    public function countByIds(array $ids) {
+        if(empty($ids)) {
+            throw new InvalidArgumentException('View ID not provided');
+}
+        
+        $response = $this->_call('views/count_many.json?ids=' . implode(',', $ids));
+        
         return $response;
     }
-}
\ No newline at end of file
+}
diff --git a/src/app/code/community/Zendesk/Zendesk/Model/Observer.php b/src/app/code/community/Zendesk/Zendesk/Model/Observer.php
index cef79f49..dd02e2b4 100644
--- a/src/app/code/community/Zendesk/Zendesk/Model/Observer.php
+++ b/src/app/code/community/Zendesk/Zendesk/Model/Observer.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright 2012 Zendesk.
  *
@@ -70,7 +71,7 @@ public function saveConfig(Varien_Event_Observer $observer)
             $scopeId = $store->getId();
         }
 
-        $enableEmail = Mage::getStoreConfig('zendesk/features/contact_us', $storeCode);
+        $enableEmail = Mage::getStoreConfig('zendesk/frontend_features/contact_us', $storeCode);
         $currentEmail = Mage::getStoreConfig('contacts/email/recipient_email', $storeCode);
         $oldEmail = Mage::getStoreConfig('zendesk/hidden/contact_email_old', $storeCode);
         $zendeskEmail = Mage::helper('zendesk')->getSupportEmail($storeCode);
@@ -101,7 +102,7 @@ public function saveConfig(Varien_Event_Observer $observer)
     public function addTicketButton(Varien_Event_Observer $event)
     {
         $block = $event->getBlock();
-        if ($block instanceof Mage_Adminhtml_Block_Sales_Order_View && Mage::getStoreConfig('zendesk/features/show_on_order')) {
+        if ($block instanceof Mage_Adminhtml_Block_Sales_Order_View && Mage::getStoreConfig('zendesk/backend_features/show_on_order')) {
             $block->addButton('ticket_new', array(
              'label'     => Mage::helper('zendesk')->__('Create Ticket'),
              'onclick'   => 'setLocation(\'' . $block->getUrl('adminhtml/zendesk/create') . '\')',
@@ -109,4 +110,101 @@ public function addTicketButton(Varien_Event_Observer $event)
             ));
         }
     }
+    
+    public function changeIdentity(Varien_Event_Observer $event)
+    {
+        if(!Mage::getStoreConfig('zendesk/general/customer_sync'))
+            return;
+        
+        $user = null;
+        $customer = $event->getCustomer();
+        $email = $customer->getEmail();
+        $orig_email = $customer->getOrigData();
+        $orig_email = $orig_email['email'];
+        
+        //Get Customer Group
+        $group_id = $customer->getGroupId();
+        $group = Mage::getModel('customer/group')->load($group_id);
+        
+        //Get Customer Last Login Date
+        $log_customer = Mage::getModel('log/customer')->loadByCustomer($customer); 
+        if ($log_customer->getLoginAt())
+            $logged_in = date("Y-m-d\TH:i:s\Z",strtotime($log_customer->getLoginAt()));
+        else
+            $logged_in = "";
+        
+        //Get Customer Sales Statistics
+        $order_totals = Mage::getResourceModel('sales/order_collection');
+        $lifetime_sale = 0;
+        $average_sale = 0;
+        
+        if (is_object($order_totals)) {
+            $order_totals
+            ->addFieldToSelect('*')
+            ->addFieldToFilter('customer_id', $customer->getId())
+            ->addFieldToFilter('status', Mage_Sales_Model_Order::STATE_COMPLETE)
+            ->addAttributeToSelect('grand_total')
+            ->getColumnValues('grand_total');
+            
+            $sum = 0;
+            foreach ($order_totals as $total) {
+                if (isset($total['grand_total']))
+                    $sum += (float)$total['grand_total'];
+            }
+            
+            $lifetime_sale = Mage::helper('core')->currency($sum, true, false);
+            $average_sale = Mage::helper('core')->currency($sum / count($order_totals), true, false);
+        }
+        
+        $info['user'] = array(
+                "name"          =>  $customer->getFirstname() . " " . $customer->getLastname(),
+                "email"         =>  $email,
+                "user_fields"       =>  array(
+                    "group"         =>  $group->getCode(),
+                    "name"          =>  $customer->getFirstname() . " " . $customer->getLastname(),
+                    "id"            =>  $customer->getId(),
+                    "logged_in"     =>  $logged_in,
+                    "average_sale"  =>  $average_sale,
+                    "lifetime_sale" =>  $lifetime_sale
+                )
+            ); 
+        
+        if($orig_email && $orig_email !== $email) {
+            $user = Mage::getModel('zendesk/api_users')->find($orig_email);
+            
+            if(isset($user['id'])) {
+                $data['identity'] = array(
+                    'type'      =>  'email',
+                    'value'     =>  $email,
+                    'verified'  =>  true
+                );
+                $identity = Mage::getModel('zendesk/api_users')->addIdentity($user['id'],$data);
+                if(isset($identity['id'])) {
+                    Mage::getModel('zendesk/api_users')->setPrimaryIdentity($user['id'], $identity['id']);
+                }
+            }
+        }
+
+        if(!$user) {
+            $user = Mage::getModel('zendesk/api_users')->find($email);
+        }
+        
+        if(isset($user['id'])) {
+            $this->syncData($user['id'], $info);
+        } else {
+            $info['user']['verified'] = true;
+            $this->createAccount($info);
+        }
+    }
+    
+    public function syncData($user_id, $data)
+    {
+        Mage::getModel('zendesk/api_users')->update($user_id, $data);
+    }
+    
+    public function createAccount($data)
+    {
+        Mage::getModel('zendesk/api_users')->create($data);
+    }
+    
 }
diff --git a/src/app/code/community/Zendesk/Zendesk/Model/Resource/Tickets.php b/src/app/code/community/Zendesk/Zendesk/Model/Resource/Tickets.php
new file mode 100644
index 00000000..0c737d49
--- /dev/null
+++ b/src/app/code/community/Zendesk/Zendesk/Model/Resource/Tickets.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * Copyright 2015 Zendesk
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+class Zendesk_Zendesk_Model_Resource_Tickets extends Mage_Core_Model_Resource_Db_Abstract {
+    
+    protected function _construct()
+    {
+        $this->_init('zendesk/tickets', 'id');
+    }
+}
diff --git a/src/app/code/community/Zendesk/Zendesk/Model/Resource/Tickets/Collection.php b/src/app/code/community/Zendesk/Zendesk/Model/Resource/Tickets/Collection.php
new file mode 100644
index 00000000..babe9adb
--- /dev/null
+++ b/src/app/code/community/Zendesk/Zendesk/Model/Resource/Tickets/Collection.php
@@ -0,0 +1,186 @@
+<?php
+
+/**
+ * Copyright 2015 Zendesk
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+class Zendesk_Zendesk_Model_Resource_Tickets_Collection extends Varien_Data_Collection {
+
+    protected $_count;
+    protected $_search;
+    protected $_viewColumns = array();
+    protected static $_excludedColumns = array('score');
+
+    public function __construct() {
+        $this->_search = new Zendesk_Zendesk_Model_Search( Zendesk_Zendesk_Model_Search::TYPE_TICKET );
+    }
+
+    public function addFieldToFilter($fieldName, $condition = null) {
+        if(is_string($condition) OR is_array($condition)) {
+            
+            $searchFields = array();
+            
+            switch($fieldName) {
+                case 'subject':
+                    $searchFields[] = array(
+                        'field' =>  'subject',
+                        'value' =>  '"'.$condition.'"'
+                    );
+                    break;
+                case 'requester':
+                case 'requester_id':
+                    $value = is_numeric($condition) ? $condition : '*' . $condition . '*';
+                    $searchFields[] = array(
+                        'field' =>  'requester',
+                        'value' =>  $value
+                    );
+                    break;
+                case 'tags':
+                case 'status':
+                case 'priority':
+                case 'status':
+                case 'group':
+                case 'assignee':
+                    $searchFields[] = array(
+                        'field' =>  $fieldName,
+                        'value' =>  $condition
+                    );
+                    break;
+                case 'type':
+                    $searchFields[] = array(
+                        'field' =>  'ticket_type',
+                        'value' =>  $condition
+                    );
+                    break;
+                case 'id':
+                    $searchFields[] = array(
+                        'field'     =>  '',
+                        'value'     =>  $condition,
+                        'operator'  =>  ''
+                    );
+                    break;
+                case 'created_at':
+                case 'updated_at':
+                    $fieldName  = substr($fieldName, 0, -3);
+                    
+                    if( isset($condition['from']) AND Mage::helper('zendesk')->isValidDate($condition['from']) ) {
+                        $value = Mage::helper('zendesk')->getFormatedDataForAPI( $condition['from'] );
+                        $searchFields[] = array(
+                            'field'     =>  $fieldName,
+                            'value'     =>  $value,
+                            'operator'  =>  '>'
+                        );
+                    }
+                    
+                    if( isset($condition['to']) AND Mage::helper('zendesk')->isValidDate($condition['to']) ) {
+                        $value = Mage::helper('zendesk')->getFormatedDataForAPI( $condition['to'] );
+                        $searchFields[] = array(
+                            'field'     =>  $fieldName,
+                            'value'     =>  $value,
+                            'operator'  =>  '<'
+                        );
+                    }
+                    break;
+            }
+            foreach ($searchFields as $field) {
+                $operator = isset($field['operator']) ? $field['operator'] : ":";
+                $value = isset($field['value']) ? $field['value'] : "none";
+                $this->_search->addField( new Zendesk_Zendesk_Model_Search_Field($field['field'], $value, $operator));
+            }
+        }
+
+        return $this;
+    }
+    
+    public function getCollection(array $params = array()) {
+        $searchQuery = array(
+            'query' => $this->_search->getString(),
+        );
+        
+        $params = array_merge($searchQuery, $params);
+        
+        $all = Mage::getModel('zendesk/api_tickets')->search($params);
+
+        foreach ($all['results'] as $ticket) {
+            $obj = new Varien_Object();
+            $obj->setData($ticket);
+            $this->addItem($obj);
+        }
+
+        $this->setPageSize($params['per_page']);
+        $this->setCurPage($params['page']);
+        $this->setOrder($params['sort_by'], $params['sort_order']);
+        $this->_count = $all['count'];
+        
+        Mage::unregister('zendesk_tickets_all');
+        Mage::register('zendesk_tickets_all', $all['count']);
+        
+        return $this;
+    }
+    
+    public function getCollectionFromView($viewId, array $params = array()) {
+        $view = Mage::getModel('zendesk/api_views')->execute($viewId, $params);
+        
+        foreach ($view['rows'] as $row) {
+            $ticket = array_merge($row, $row['ticket']);
+            
+            $this->appendParamsWithoutIdPostfix($ticket, array('requester', 'assignee', 'group'));
+            
+            $obj = new Varien_Object();
+            $obj->setData($ticket);
+            $this->addItem($obj);
+        }
+        
+        $this->_viewColumns = $view['columns'];
+
+        $this->setPageSize($params['per_page']);
+        $this->setCurPage($params['page']);
+        $this->setOrder($params['sort_by'], $params['sort_order']);
+        $this->_count = $view['count'];
+            
+        Mage::unregister('zendesk_tickets_view_'.$viewId);
+        Mage::register('zendesk_tickets_view_'.$viewId, $view['count']);
+        
+        return $this;
+    }
+    
+    protected function appendParamsWithoutIdPostfix(& $item, array $params = array()) {
+        foreach($params as $param) {
+            $name = $param . '_id';
+            
+            if(isset($item[$name])) {
+                $item[$param] = $item[$name];
+            }
+        }
+    }
+    
+    public function getColumnsForView() {
+        $excludedColumns = static::$_excludedColumns;
+        
+        return array_filter($this->_viewColumns, function($column) use($excludedColumns) {
+            return ! in_array($column['id'], $excludedColumns);
+        });
+    }
+
+    /**
+     * Retrieve collection all items count
+     *
+     * @return int
+     */
+    public function getSize() {
+        return (int) $this->_count;
+    }
+
+}
diff --git a/src/app/code/community/Zendesk/Zendesk/Model/Search.php b/src/app/code/community/Zendesk/Zendesk/Model/Search.php
new file mode 100644
index 00000000..94052a81
--- /dev/null
+++ b/src/app/code/community/Zendesk/Zendesk/Model/Search.php
@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * Copyright 2013 Zendesk.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+class Zendesk_Zendesk_Model_Search {
+    const TYPE_TICKET = 'ticket';
+    const TYPE_USER = 'user';
+    
+    protected $type;
+    protected $separator = ' ';
+    protected $fields = array();
+    
+    public function __construct($type) {
+        $this->setType($type);
+    }
+    
+    public function setType($type) {
+        $this->type = $type;
+    }
+    
+    public function addField(Zendesk_Zendesk_Model_Search_Field $field) {
+        $this->fields[] = $field;
+    }
+    
+    public function addFields(array $fields) {
+        foreach($fields as $field) {
+            if($field instanceof Zendesk_Zendesk_Model_Search_Field) {
+                $this->addField($field);
+            }
+        }
+    }
+    
+    public function getString() {
+        return 'type:' . $this->type . $this->separator . implode($this->separator, $this->fields);
+    }
+}
diff --git a/src/app/code/community/Zendesk/Zendesk/Model/Search/Field.php b/src/app/code/community/Zendesk/Zendesk/Model/Search/Field.php
new file mode 100644
index 00000000..ec1caf73
--- /dev/null
+++ b/src/app/code/community/Zendesk/Zendesk/Model/Search/Field.php
@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * Copyright 2013 Zendesk.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+class Zendesk_Zendesk_Model_Search_Field {
+    protected $name;
+    protected $value;
+    protected $operator;
+    
+    public function __construct($name, $value = 'none', $operator = ':') {
+        $this->setName($name);
+        $this->setValue($value);
+        $this->setOperator($operator);
+    }
+    
+    public function setName($name) {
+        $this->name = $name;
+    }
+    
+    public function setValue($value) {
+        $this->value = $value;
+    }
+    
+    public function setOperator($operator) {
+        $this->operator = $operator;
+    }
+    
+    public function getString() {
+        return $this->name . $this->operator . $this->value;
+    }
+    
+    public function __toString() {
+        return $this->getString();
+    }
+    
+}
diff --git a/src/app/code/community/Zendesk/Zendesk/Model/Source/Sortdir.php b/src/app/code/community/Zendesk/Zendesk/Model/Source/Sortdir.php
new file mode 100644
index 00000000..cd74f71b
--- /dev/null
+++ b/src/app/code/community/Zendesk/Zendesk/Model/Source/Sortdir.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright 2015 Zendesk
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+class Zendesk_Zendesk_Model_Source_Sortdir {
+
+    protected $_options = array();
+ 
+    public function toOptionArray() {
+
+        $this->_options[] = array(
+            'label' =>  Mage::helper('zendesk')->__('Descending'),
+            'value' =>  'desc'
+        );
+            
+        $this->_options[] = array(
+            'label' =>  Mage::helper('zendesk')->__('Ascending'),
+            'value' =>  'asc'
+        );
+            
+          
+        return $this->_options;
+    }
+}
diff --git a/src/app/code/community/Zendesk/Zendesk/Model/Source/Sortorder.php b/src/app/code/community/Zendesk/Zendesk/Model/Source/Sortorder.php
new file mode 100644
index 00000000..8a79b011
--- /dev/null
+++ b/src/app/code/community/Zendesk/Zendesk/Model/Source/Sortorder.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright 2015 Zendesk
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+class Zendesk_Zendesk_Model_Source_Sortorder {
+
+    protected $_options = array();
+ 
+    public function toOptionArray() {
+
+        $this->_options[] = array(
+            'label' =>  Mage::helper('zendesk')->__('Requested Date'),
+            'value' =>  'created_at'
+        );
+            
+        $this->_options[] = array(
+            'label' =>  Mage::helper('zendesk')->__('Updated Date'),
+            'value' =>  'updated_at'
+        );
+            
+          
+        return $this->_options;
+    }
+}
diff --git a/src/app/code/community/Zendesk/Zendesk/Model/Tickets.php b/src/app/code/community/Zendesk/Zendesk/Model/Tickets.php
new file mode 100644
index 00000000..6fa10b4d
--- /dev/null
+++ b/src/app/code/community/Zendesk/Zendesk/Model/Tickets.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * Copyright 2015 Zendesk
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+class Zendesk_Zendesk_Model_Tickets extends Mage_Core_Model_Abstract {
+    
+    protected function _construct()
+    {
+        $this->_init('zendesk/tickets');
+    }
+
+}
diff --git a/src/app/code/community/Zendesk/Zendesk/controllers/Adminhtml/ZendeskController.php b/src/app/code/community/Zendesk/Zendesk/controllers/Adminhtml/ZendeskController.php
index 574b0a68..cc09dcd4 100644
--- a/src/app/code/community/Zendesk/Zendesk/controllers/Adminhtml/ZendeskController.php
+++ b/src/app/code/community/Zendesk/Zendesk/controllers/Adminhtml/ZendeskController.php
@@ -23,6 +23,21 @@ class Zendesk_Zendesk_Adminhtml_ZendeskController extends Mage_Adminhtml_Control
 
     public function indexAction()
     {
+        if (!$this->_domainConfigured()) {
+            return;
+        }
+
+        $connection = Mage::helper('zendesk')->getConnectionStatus();
+        
+        if(!$connection['success']) {
+            $this->setFlag('', 'no-dispatch', true);
+            Mage::getSingleton('adminhtml/session')->addError( $connection['msg'] );
+            $this->_redirect('adminhtml/dashboard');
+            return;
+        }
+        
+        $this->storeDependenciesInCachedRegistry();
+        
         $this->_title($this->__('Zendesk Dashboard'));
         $this->loadLayout();
         $this->_setActiveMenu('zendesk/zendesk_dashboard');
@@ -66,6 +81,7 @@ public function authenticateAction()
 
         $domain = Mage::getStoreConfig('zendesk/general/domain');
         $token = Mage::getStoreConfig('zendesk/sso/token');
+        $return_url = Mage::helper('core')->urlDecode($this->getRequest()->getParam('return_url', ""));
 
         if(!Zend_Validate::is($domain, 'NotEmpty')) {
             Mage::getSingleton('adminhtml/session')->addError(Mage::helper('zendesk')->__('Zendesk domain not set. Please add this to the settings page.'));
@@ -101,19 +117,26 @@ public function authenticateAction()
         Mage::log('Admin JWT: ' . var_export($payload, true), null, 'zendesk.log');
 
         $jwt = JWT::encode($payload, $token);
-
-        $url = "http://".$domain."/access/jwt?jwt=" . $jwt;
+        $return = $return_url ? "&return_to=".$return_url : "";
+        
+        $url = "http://".$domain."/access/jwt?jwt=" . $jwt . $return;
 
         Mage::log('Admin URL: ' . $url, null, 'zendesk.log');
 
         $this->_redirectUrl($url);
     }
-
+    
     /**
      * Wrapper for the existing authenticate action. Mirrors the login/logout actions available for customers.
      */
     public function loginAction()
     {
+        if(!Mage::getStoreConfig('zendesk/sso/enabled')) {
+            Mage::getSingleton('adminhtml/session')->addError(Mage::helper('zendesk')->__('Single sign-on disabled.'));
+            $url = Mage::helper('core')->urlDecode($this->getRequest()->getParam('return_url', ""));
+            $this->_redirectUrl($url);
+            return;
+        }
         $this->authenticateAction();
     }
 
@@ -129,11 +152,15 @@ public function logoutAction()
         $adminSession->getCookie()->delete($adminSession->getSessionName());
         $adminSession->addSuccess(Mage::helper('adminhtml')->__('You have logged out.'));
 
-        $this->_redirect('*');
+        $this->_redirect('adminhtml/zendesk/*');
     }
 
     public function createAction()
     {
+        if (!$this->_domainConfigured()) {
+            return;
+        }
+        
         // Check if we have been passed an order ID, in which case we can preload some of the form details
         if($orderId = $this->getRequest()->getParam('order_id')) {
             $order = Mage::getModel('sales/order')->load($orderId);
@@ -162,11 +189,27 @@ public function createAction()
         $this->getLayout()->getBlock('js')->append($block);
 
         $this->renderLayout();
+
     }
 
     public function launchAction()
     {
-        $this->_redirectUrl(Mage::helper('zendesk')->getUrl());
+        $domain = $this->_domainConfigured();
+        if (!$domain) {
+            return;
+        }
+        
+        $sso = Mage::getStoreConfig('zendesk/sso/enabled');
+        
+        if (!$sso) {
+            $url = "http://".$domain;
+        } elseif(Mage::helper('zendesk')->isSSOAdminUsersEnabled()) {
+            $url = Mage::helper('zendesk')->getSSOAuthUrlAdminUsers();
+        } else {
+            $url = Mage::helper('zendesk')->getZendeskUnauthUrl();
+        }
+
+        $this->_redirectUrl($url);
     }
 
     public function saveAction()
@@ -255,7 +298,7 @@ public function saveAction()
                     $ticket['ticket']['type'] = $data['type'];
                 }
 
-                if( ($fieldId = Mage::getStoreConfig('zendesk/features/order_field_id')) && isset($data['order']) && strlen(trim($data['order'])) > 0) {
+                if( ($fieldId = Mage::getStoreConfig('zendesk/frontend_features/order_field_id')) && isset($data['order']) && strlen(trim($data['order'])) > 0) {
                     $ticket['ticket']['fields'] = array(
                         'id' => $fieldId,
                         'value' => $data['order']
@@ -265,7 +308,7 @@ public function saveAction()
                 $response = Mage::getModel('zendesk/api_tickets')->create($ticket);
 
                 $text = Mage::helper('zendesk')->__('Ticket #%s Created', $response['id']);
-                $text .= ' <a href="' . Mage::helper('zendesk')->getUrl('ticket', $response['id']) . '" target="_blank">';
+                $text .= ' <a href="' . Mage::helper('zendesk')->getTicketUrl($response, true) . '" target="_blank">';
                 $text .= Mage::helper('zendesk')->__('View ticket in Zendesk');
                 $text .= '</a>';
 
@@ -319,7 +362,7 @@ public function autocompleteAction()
     public function logAction()
     {
         $path = Mage::helper('zendesk/log')->getLogPath();
-
+        
         if(!file_exists($path)) {
             Mage::getSingleton('adminhtml/session')->addError(Mage::helper('zendesk')->__('The Zendesk log file has not been created. Check to see if logging has been enabled.'));
         }
@@ -346,18 +389,329 @@ public function clearLogAction()
     }
 
     public function checkOutboundAction()
+    {    
+        $connection = Mage::helper('zendesk')->getConnectionStatus();
+            
+        $this->getResponse()->clearHeaders()->setHeader('Content-type','application/json', true);
+        $this->getResponse()->setBody(json_encode($connection));
+        } 
+            
+    /**
+     * Loading page block
+     */
+    public function loadBlockAction()
     {
-        try {
-            // Try to retrieve a user with ID 1, which should always exist as a user account is needed to set up
-            // the API credentials in the first place.
+        $request = $this->getRequest();
+
+        $block = $request->getParam('block');
+        $update = $this->getLayout()->getUpdate();
+
+
+        $update->addHandle('adminhtml_zendesk_create_load_block_'.$block);
+
+        $this->loadLayoutUpdates()->generateLayoutXml()->generateLayoutBlocks();
+        $result = $this->getLayout()->getBlock('content')->toHtml();
+        if ($request->getParam('as_js_varname')) {
+            Mage::getSingleton('adminhtml/session')->setUpdateResult($result);
+            $this->_redirect('*/*/showUpdateResult');
+        } else {
+            $this->getResponse()->setBody($result);
+        }
+    }
+    
+    public function getUserAction()
+    {
+        $request = $this->getRequest();
+        $id = $request->getParam('id');
+        
+        $user = Mage::getModel('customer/customer')->load($id);
+        
+        $this->getResponse()->clearHeaders()->setHeader('Content-type','application/json',true);
+        
+        if($user->getId()) {
+            $this->getResponse()->setBody(json_encode(array('success'=>true, 'usr'=> array(
+                'firstname' =>  $user->getFirstname(),
+                'lastname'  =>  $user->getLastname(),
+                'email'     =>  $user->getEmail()
+            ))));
+        } else {
+            $this->getResponse()->setBody(json_encode(array('success'=>false, 'msg'=>Mage::helper('zendesk')->__('User does not exist'))));
+        }
+    }
+        
+    public function getOrderAction()
+    {
+        $request = $this->getRequest();
+        $id= $request->getParam('id');
+        
+        $order = Mage::getModel('sales/order')->load($id);
+        
+        $this->getResponse()->clearHeaders()->setHeader('Content-type','application/json',true);
+        if($order->getId()) {
+            $this->getResponse()->setBody(json_encode(array('success'=>true, 'order'=> array(
+                'number' =>  $order->getIncrementId(),
+            ))));
+        } else {
+            $this->getResponse()->setBody(json_encode(array('success'=>false, 'msg'=>Mage::helper('zendesk')->__('Order does not exist'))));
+        }
+    }
+    
+    public function syncAction()
+    {
+        $this->getResponse()->clearHeaders()->setHeader('Content-type','application/json',true);
+        Mage::log('Synchronization started', null, 'zendesk.log');
+        try {           
             $user = Mage::getModel('zendesk/api_users')->all();
-            Mage::getSingleton('adminhtml/session')->addSuccess(Mage::helper('zendesk')->__('Connection to Zendesk API successful'));
-        } catch(Exception $e) {
-            Mage::getSingleton('adminhtml/session')->addError(Mage::helper('zendesk')->__('Connection to Zendesk API failed') .
-                '<br />' . $e->getCode() . ': ' . $e->getMessage() .
-                '<br />' . Mage::helper('zendesk')->__('Troubleshooting tips can be found at <a href=%s>%s</a>', 'https://support.zendesk.com/entries/26579987', 'https://support.zendesk.com/entries/26579987'));
+            if (is_null($user))
+                throw new Exception("Connection Failed");
+            
+            $data = array();
+            $data[] = array(
+                'user_field' => array(
+                    'type'          =>  'integer',
+                    'title'         =>  'ID',
+                    'description'   =>  'Magento Customer Id',
+                    'position'      =>  0,
+                    'active'        =>  true,
+                    'key'           =>  'id'
+                )
+            );
+            $data[] = array(
+                'user_field' => array(
+                    'type'          =>  'text',
+                    'title'         =>  'Name',
+                    'description'   =>  'Magento Customer Name',
+                    'position'      =>  1,
+                    'active'        =>  true,
+                    'key'           =>  'name'
+                )
+            );
+            $data[] = array(
+                'user_field' => array(
+                    'type'          =>  'text',
+                    'title'         =>  'Group',
+                    'description'   =>  'Magento Customer Group',
+                    'position'      =>  2,
+                    'active'        =>  true,
+                    'key'           =>  'group'
+                )
+            );
+            $data[] = array(
+                'user_field' => array(
+                    'type'          =>  'text',
+                    'title'         =>  'Lifetime Sale',
+                    'description'   =>  'Magento Customer Lifetime Sale',
+                    'position'      =>  3,
+                    'active'        =>  true,
+                    'key'           =>  'lifetime_sale'
+                )
+            );
+            $data[] = array(
+                'user_field' => array(
+                    'type'          =>  'text',
+                    'title'         =>  'Average Sale',
+                    'description'   =>  'Magento Customer Average Sale',
+                    'position'      =>  4,
+                    'active'        =>  true,
+                    'key'           =>  'average_sale'
+                )
+            );
+            $data[] = array(
+                'user_field' => array(
+                    'type'          =>  'date',
+                    'title'         =>  'Last Logged In',
+                    'description'   =>  'Last Logged In',
+                    'position'      =>  5,
+                    'active'        =>  true,
+                    'key'           =>  'logged_in'
+                )
+            );
+
+            foreach($data as $field) {
+                $response = Mage::getModel('zendesk/api_users')->createUserField($field);
+                if (!isset($response['active']) || $response['active'] === false)
+                    Mage::log('Unable to create User Field with key '.$field['user_field']['key'], null, 'zendesk.log');
+            }
+            
+            $customers = Mage::getModel('customer/customer')->getCollection();
+            $customers->addAttributeToSelect(array('firstname', 'lastname', 'email'));
+            foreach($customers as $customer) {
+                Mage::log('Synchronizing customer with id '.$customer->getId(), null, 'zendesk.log');
+                Mage::dispatchEvent('customer_save_commit_after', array('customer' => $customer));
+            }
+            
+        } catch (Exception $ex) {
+            Mage::log('Synchronization failed: '.$ex->getMessage(), null, 'zendesk.log');
+            $this->getResponse()->setBody(json_encode(array('success'=>false, 'msg'=>Mage::helper('zendesk')->__('Synchronization failed: ').$ex->getMessage())));
+            return;
         }
+        Mage::log('Synchronization completed successfully', null, 'zendesk.log');
+        $this->getResponse()->setBody(json_encode(array('success'=>true, 'msg'=>Mage::helper('zendesk')->__('Customers synchronization finished successfuly'))));
+    }
 
-        $this->_redirect('adminhtml/system_config/edit/section/zendesk');
+    public function bulkDeleteAction()
+    {
+        $ids = $this->getRequest()->getParam('id');
+        try {
+            $response = Mage::getModel('zendesk/api_tickets')->bulkDelete($ids);
+            $message = '%d out of %d ticket(s) were deleted.';
+            $this->getMassActionResponse($response, $ids, $message);
+        } catch (Exception $e) {
+            Mage::getSingleton('adminhtml/session')->addError($e->getMessage());
+        }
+        $this->_redirectReferer();
+    }
+    
+    public function bulkChangeStatusAction()
+    {
+        $ids = $this->getRequest()->getParam('id');
+        $status = $this->getRequest()->getParam('status');
+        
+        try {
+            $response = Mage::getModel('zendesk/api_tickets')->updateMany($ids, compact('status'));
+            $this->getMassActionResponse($response, $ids);
+        } catch (Exception $e) {
+            Mage::getSingleton('adminhtml/session')->addError($e->getMessage());
+        }
+        $this->_redirect('adminhtml/zendesk/');
+    }
+    
+    public function bulkChangePriorityAction()
+    {
+        $ids = $this->getRequest()->getParam('id');
+        $priority = $this->getRequest()->getParam('priority');
+        
+        try {
+            $response = Mage::getModel('zendesk/api_tickets')->updateMany($ids, compact('priority'));
+            $this->getMassActionResponse($response, $ids);
+        } catch (Exception $e) {
+            Mage::getSingleton('adminhtml/session')->addError($e->getMessage());
+        }
+        $this->_redirect('adminhtml/zendesk/');
+    }
+    
+    public function bulkChangeTypeAction()
+    {
+        $ids = $this->getRequest()->getParam('id');
+        $type = $this->getRequest()->getParam('type');
+        
+        try {
+            $response = Mage::getModel('zendesk/api_tickets')->updateMany($ids, compact('type'));
+            $this->getMassActionResponse($response, $ids);
+        } catch (Exception $e) {
+            Mage::getSingleton('adminhtml/session')->addError($e->getMessage());
+        }
+        $this->_redirect('adminhtml/zendesk/');
+    }
+    
+    public function bulkMarkSpamAction()
+    {
+        $ids = $this->getRequest()->getParam('id');
+        
+        try {
+            $response = Mage::getModel('zendesk/api_tickets')->bulkMarkAsSpam($ids);
+            $message = '%d out of %d ticket(s) were marked as spam.';
+            $this->getMassActionResponse($response, $ids, $message);
+        } catch (Exception $e) {
+            Mage::getSingleton('adminhtml/session')->addError($e->getMessage());
+        }
+        $this->_redirectReferer();
+    }
+
+    public function ticketsAllAction() {
+        $isAjax = Mage::app()->getRequest()->isAjax();
+        
+        if ($isAjax) {
+            $this->storeDependenciesInCachedRegistry();
+            $this->getResponse()->setBody($this->getLayout()->createBlock('zendesk/adminhtml_dashboard_tab_tickets_grid_all')->toHtml());
+        }
+    }
+    
+    public function ticketsViewAction() {
+        $isAjax = Mage::app()->getRequest()->isAjax();
+
+        if ($isAjax) {
+            $this->storeDependenciesInCachedRegistry();
+            $viewId = (int) $this->getRequest()->getParam('viewid');
+            Mage::register('zendesk_tickets_view', $viewId);
+            
+            $this->getResponse()->setBody($this->getLayout()->createBlock('zendesk/adminhtml_dashboard_tab_tickets_grid_view')->toHtml());
+        }
     }
+    
+    protected function storeDependenciesInCachedRegistry() {
+        $cache = Mage::app()->getCache();
+        
+        if( $cache->load('zendesk_users') === false) {
+            $users = serialize( Mage::getModel('zendesk/api_users')->all() );
+            $cache->save($users, 'zendesk_users', array('zendesk', 'zendesk_users'), 300);
+        }
+        
+        if( $cache->load('zendesk_groups') === false) {
+            $groups = serialize( Mage::getModel('zendesk/api_groups')->all() );
+            $cache->save($groups, 'zendesk_groups', array('zendesk', 'zendesk_groups'), 1200);
+        }
+        
+        $users  = unserialize( $cache->load('zendesk_users') );
+        $groups = unserialize( $cache->load('zendesk_groups') );
+        
+        Mage::register('zendesk_users', $users);
+        Mage::register('zendesk_groups', $groups);
+    }
+    
+    protected function getMassActionResponse($response, $ids, $message = '%d out of %d ticket(s) were updated.')
+    {
+        if (isset($response['job_status']) && isset($response['job_status']['url'])) {
+            $job_status = Mage::getModel('zendesk/api_tickets')->getJobStatus($response['job_status']['url']);
+            
+            $parsed = array();
+            $parsed['errors'] = array();
+            $parsed['success'] = 0;
+            
+            if (isset($job_status['job_status']['results'])) {
+                foreach ($job_status['job_status']['results'] as $result) {
+                    if ($result['success']) {
+                        $parsed['success'] ++;
+                        continue;
+                    }
+
+                    if ($result['errors'])
+                        $parsed['errors'][] = $result['errors']." (ID:".$result['id'].")";
+                }
+            }
+
+            Mage::getSingleton('adminhtml/session')->addSuccess(
+                Mage::helper('zendesk')->__(
+                    $message, 
+                    $parsed['success'], 
+                    count($ids)
+                )
+            );
+
+            foreach ($parsed['errors'] as $error) {
+                Mage::getSingleton('adminhtml/session')->addError(
+                        Mage::helper('zendesk')->__($error)
+                );
+            }
+        } else {
+            Mage::getSingleton('adminhtml/session')->addError(
+                    Mage::helper('zendesk')->__(
+                            'Request failed for %d ticket(s).', count($ids)
+                    )
+            );
+        }
+    }
+    
+    private function _domainConfigured()
+    {
+        $domain = Mage::getStoreConfig('zendesk/general/domain');
+        if(!$domain) {
+            Mage::getSingleton('adminhtml/session')->addError(Mage::helper('zendesk')->__('Please set up Zendesk connection.'));
+            $this->_redirect('adminhtml/dashboard');
+            return false;
+        } else {
+            return $domain;
+        }
+    }
+
 }
diff --git a/src/app/code/community/Zendesk/Zendesk/controllers/ApiController.php b/src/app/code/community/Zendesk/Zendesk/controllers/ApiController.php
index c3cd7ae2..12e7d91e 100644
--- a/src/app/code/community/Zendesk/Zendesk/controllers/ApiController.php
+++ b/src/app/code/community/Zendesk/Zendesk/controllers/ApiController.php
@@ -32,6 +32,10 @@ public function _authorise()
         if(!$tokenString && isset($_SERVER['HTTP_AUTHORIZATION'])) {
             $tokenString = $_SERVER['HTTP_AUTHORIZATION'];
         }
+        
+        if (!$tokenString && isset($_SERVER['REDIRECT_HTTP_AUTHORIZATION'])) {
+            $tokenString = $_SERVER['REDIRECT_HTTP_AUTHORIZATION'];
+        }
 
         if (!$tokenString) {
             // Certain server configurations fail to extract headers from the request, see PR #24.
@@ -308,7 +312,7 @@ public function finaliseAction()
         if(!isset($data['order_field_id'])) {
             $missingFields[] = 'order_field_id';
         } else {
-            $configUpdates['zendesk/features/order_field_id'] = $data['order_field_id'];
+            $configUpdates['zendesk/frontend_features/order_field_id'] = $data['order_field_id'];
         }
 
         // Check that the required fields were provided and send back an error if not
@@ -339,15 +343,15 @@ public function finaliseAction()
         }
 
         if(isset($data['magento_footer_link'])) {
-            $configUpdates['zendesk/features/footer_link_enabled'] = ($data['magento_footer_link'] == 'true');
+            $configUpdates['zendesk/frontend_features/footer_link_enabled'] = ($data['magento_footer_link'] == 'true');
         }
 
         if(isset($data['email_forwarding'])) {
-            $configUpdates['zendesk/features/contact_us'] = ($data['email_forwarding'] == 'true');
+            $configUpdates['zendesk/frontend_features/contact_us'] = ($data['email_forwarding'] == 'true');
 
             // Process this now, since it otherwise won't be triggered until the config page is saved
             // Unlike in the observer, we only need to deal with the case where the setting is enabled
-            if($configUpdates['zendesk/features/contact_us']) {
+            if($configUpdates['zendesk/frontend_features/contact_us']) {
 
                 $currentEmail = Mage::getStoreConfig('contacts/email/recipient_email');
                 $zendeskEmail = 'support@' . $configUpdates['zendesk/general/domain'];
@@ -364,11 +368,11 @@ public function finaliseAction()
         }
 
         if(isset($data['feedback_tab'])) {
-            $configUpdates['zendesk/features/feedback_tab_code_active'] = ($data['feedback_tab'] === 'true');
+            $configUpdates['zendesk/frontend_features/feedback_tab_code_active'] = ($data['feedback_tab'] === 'true');
         }
 
         if(isset($data['feedback_tab_html'])) {
-            $configUpdates['zendesk/features/feedback_tab_code'] = $data['feedback_tab_html'];
+            $configUpdates['zendesk/frontend_features/feedback_tab_code'] = $data['feedback_tab_html'];
         }
 
 
diff --git a/src/app/code/community/Zendesk/Zendesk/controllers/IndexController.php b/src/app/code/community/Zendesk/Zendesk/controllers/IndexController.php
index 63610cd8..a38f8784 100644
--- a/src/app/code/community/Zendesk/Zendesk/controllers/IndexController.php
+++ b/src/app/code/community/Zendesk/Zendesk/controllers/IndexController.php
@@ -22,7 +22,12 @@ class Zendesk_Zendesk_IndexController extends Mage_Core_Controller_Front_Action
      */
     public function indexAction()
     {
-        $url = Mage::helper('zendesk')->getUrl();
+        if(Mage::helper('zendesk')->isSSOEndUsersEnabled()) {
+            $url = Mage::helper('zendesk')->getSSOAuthUrlEndUsers();
+        } else {
+            $url = Mage::helper('zendesk')->getUrl();
+        }
         $this->_redirectUrl($url);
     }
-}
\ No newline at end of file
+
+}
diff --git a/src/app/code/community/Zendesk/Zendesk/controllers/SsoController.php b/src/app/code/community/Zendesk/Zendesk/controllers/SsoController.php
index e7431c3a..15619634 100644
--- a/src/app/code/community/Zendesk/Zendesk/controllers/SsoController.php
+++ b/src/app/code/community/Zendesk/Zendesk/controllers/SsoController.php
@@ -32,7 +32,8 @@ public function loginAction()
 
         $domain = Mage::getStoreConfig('zendesk/general/domain');
         $token = Mage::getStoreConfig('zendesk/sso_frontend/token');
-
+        $return_url = Mage::helper('core')->urlDecode($this->getRequest()->getParam('return_url', ""));
+        
         if(!Zend_Validate::is($domain, 'NotEmpty')) {
             Mage::log(Mage::helper('zendesk')->__('Zendesk domain not set. Please add this to the settings page.'), null, 'zendesk.log');
             $this->_redirect('/');
@@ -77,8 +78,9 @@ public function loginAction()
         Mage::log('End-user JWT: ' . var_export($payload, true), null, 'zendesk.log');
 
         $jwt = JWT::encode($payload, $token);
-
-        $url = "http://".$domain."/access/jwt?jwt=" . $jwt;
+        $return_url = $return_url ? "&return_to=".$return_url : "";
+        
+        $url = "http://".$domain."/access/jwt?jwt=" . $jwt.$return_url;
 
         Mage::log('End-user URL: ' . $url, null, 'zendesk.log');
 
diff --git a/src/app/code/community/Zendesk/Zendesk/data/zendesk_setup/data-upgrade-1.3.0-1.4.0.php b/src/app/code/community/Zendesk/Zendesk/data/zendesk_setup/data-upgrade-1.3.0-1.4.0.php
new file mode 100644
index 00000000..3142c621
--- /dev/null
+++ b/src/app/code/community/Zendesk/Zendesk/data/zendesk_setup/data-upgrade-1.3.0-1.4.0.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright 2015 Zendesk
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+$config = new Mage_Core_Model_Config();
+$options = array();
+
+$options['zendesk/backend_features/show_on_dashboard'] = Mage::getStoreConfig('zendesk/features/show_on_dashboard');
+$options['zendesk/backend_features/show_on_order'] = Mage::getStoreConfig('zendesk/features/show_on_order');
+$options['zendesk/backend_features/show_views'] = Mage::getStoreConfig('zendesk/features/show_views');
+$options['zendesk/backend_features/show_on_customer'] = Mage::getStoreConfig('zendesk/features/show_on_customer');
+$options['zendesk/frontend_features/show_on_dashboard'] = Mage::getStoreConfig('zendesk/features/contact_us');
+$options['zendesk/frontend_features/feedback_tab_code_active'] = Mage::getStoreConfig('zendesk/features/feedback_tab_code_active');
+$options['zendesk/frontend_features/feedback_tab_code'] = Mage::getStoreConfig('zendesk/features/feedback_tab_code');
+$options['zendesk/frontend_features/feedback_tab_customise'] = Mage::getStoreConfig('zendesk/features/feedback_tab_customise');
+$options['zendesk/frontend_features/order_field_id'] = Mage::getStoreConfig('zendesk/features/order_field_id');
+$options['zendesk/frontend_features/customer_tickets'] = Mage::getStoreConfig('zendesk/features/customer_tickets');
+$options['zendesk/frontend_features/footer_link_enabled'] = Mage::getStoreConfig('zendesk/features/footer_link_enabled');
+
+foreach ( $options as $key => $value )
+{
+    $config->saveConfig($key, $value, 'default', 0);
+}
diff --git a/src/app/code/community/Zendesk/Zendesk/data/zendesk_setup/data-upgrade-1.3.1-1.4.0.php b/src/app/code/community/Zendesk/Zendesk/data/zendesk_setup/data-upgrade-1.3.1-1.4.0.php
new file mode 100644
index 00000000..3142c621
--- /dev/null
+++ b/src/app/code/community/Zendesk/Zendesk/data/zendesk_setup/data-upgrade-1.3.1-1.4.0.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright 2015 Zendesk
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+$config = new Mage_Core_Model_Config();
+$options = array();
+
+$options['zendesk/backend_features/show_on_dashboard'] = Mage::getStoreConfig('zendesk/features/show_on_dashboard');
+$options['zendesk/backend_features/show_on_order'] = Mage::getStoreConfig('zendesk/features/show_on_order');
+$options['zendesk/backend_features/show_views'] = Mage::getStoreConfig('zendesk/features/show_views');
+$options['zendesk/backend_features/show_on_customer'] = Mage::getStoreConfig('zendesk/features/show_on_customer');
+$options['zendesk/frontend_features/show_on_dashboard'] = Mage::getStoreConfig('zendesk/features/contact_us');
+$options['zendesk/frontend_features/feedback_tab_code_active'] = Mage::getStoreConfig('zendesk/features/feedback_tab_code_active');
+$options['zendesk/frontend_features/feedback_tab_code'] = Mage::getStoreConfig('zendesk/features/feedback_tab_code');
+$options['zendesk/frontend_features/feedback_tab_customise'] = Mage::getStoreConfig('zendesk/features/feedback_tab_customise');
+$options['zendesk/frontend_features/order_field_id'] = Mage::getStoreConfig('zendesk/features/order_field_id');
+$options['zendesk/frontend_features/customer_tickets'] = Mage::getStoreConfig('zendesk/features/customer_tickets');
+$options['zendesk/frontend_features/footer_link_enabled'] = Mage::getStoreConfig('zendesk/features/footer_link_enabled');
+
+foreach ( $options as $key => $value )
+{
+    $config->saveConfig($key, $value, 'default', 0);
+}
diff --git a/src/app/code/community/Zendesk/Zendesk/etc/config.xml b/src/app/code/community/Zendesk/Zendesk/etc/config.xml
index ecc42109..6501fb91 100644
--- a/src/app/code/community/Zendesk/Zendesk/etc/config.xml
+++ b/src/app/code/community/Zendesk/Zendesk/etc/config.xml
@@ -19,7 +19,7 @@
 <config>
     <modules>
         <Zendesk_Zendesk>
-            <version>1.3.1</version>
+            <version>1.4.0</version>
         </Zendesk_Zendesk>
     </modules>
     <zendesk>
@@ -79,6 +79,24 @@
                 </zendesk>
             </updates>
         </layout>
+        <events>
+            <customer_save_commit_after>
+                <observers>
+                    <zendesk>
+                        <class>zendesk/observer</class>
+                        <method>changeIdentity</method>
+                    </zendesk>
+                </observers>
+            </customer_save_commit_after>
+            <customer_login>
+                <observers>
+                    <zendesk>
+                        <class>zendesk/observer</class>
+                        <method>changeIdentity</method>
+                    </zendesk>
+                </observers>
+            </customer_login>
+        </events>
     </frontend>
     <admin>
         <routers>
@@ -109,6 +127,7 @@
             </modules>
         </translate>
         <events>
+
             <core_block_abstract_prepare_layout_before>
                 <observers>
                     <zendesk>
@@ -141,6 +160,15 @@
                     </zendesk>
                 </observers>
             </admin_system_config_changed_section_zendesk>
+            <customer_save_commit_after>
+                <observers>
+                    <zendesk>
+                        <class>zendesk/observer</class>
+                        <method>changeIdentity</method>
+                    </zendesk>
+                </observers>
+            </customer_save_commit_after>
+
         </events>
         <menu>
             <zendesk translate="title" module="zendesk">
@@ -162,11 +190,11 @@
                         <action>adminhtml/zendesk/launch</action>
                         <sort_order>3</sort_order>
                     </zendesk_launch>
-                    <zendesk_settings module="zendesk">
-                        <title>Settings</title>
+                    <zendesk_configurations module="zendesk">
+                        <title>Configuration</title>
                         <action>adminhtml/system_config/edit/section/zendesk</action>
                         <sort_order>4</sort_order>
-                    </zendesk_settings>
+                    </zendesk_configurations>
                     <zendesk_log module="zendesk">
                         <title>Log Viewer</title>
                         <action>adminhtml/zendesk/log</action>
@@ -218,13 +246,21 @@
     </adminhtml>
     <default>
         <zendesk>
-            <features>
-                <show_on_dashboard>1</show_on_dashboard>
-                <show_on_customer>1</show_on_customer>
-                <show_on_order>1</show_on_order>
+            <general>
+                <customer_sync>0</customer_sync>
+            </general>
+            <frontend_features>
                 <feedback_tab_code_active>0</feedback_tab_code_active>
                 <contact_us>0</contact_us>
-            </features>
+            </frontend_features>
+            <backend_features>
+                <show_on_dashboard>0</show_on_dashboard>
+                <show_all>1</show_all>
+                <show_on_customer>1</show_on_customer>
+                <show_on_order>1</show_on_order>
+                <default_sort>created_at</default_sort>
+                <default_sort_dir>desc</default_sort_dir>
+            </backend_features>
         </zendesk>
     </default>
 </config>
diff --git a/src/app/code/community/Zendesk/Zendesk/etc/system.xml b/src/app/code/community/Zendesk/Zendesk/etc/system.xml
index 7cf8d965..b4976a6e 100644
--- a/src/app/code/community/Zendesk/Zendesk/etc/system.xml
+++ b/src/app/code/community/Zendesk/Zendesk/etc/system.xml
@@ -35,7 +35,7 @@
             <show_in_website>1</show_in_website>
             <show_in_store>1</show_in_store>
             <groups>
-        		<general translate="label comment">
+                    <general translate="label comment">
                     <expanded>1</expanded>
                     <label>General</label>
                     <comment>General settings that are required to connect Zendesk and Magento.</comment>
@@ -44,7 +44,7 @@
                     <show_in_default>1</show_in_default>
                     <show_in_website>1</show_in_website>
                     <show_in_store>1</show_in_store>
-					<fields>
+                    <fields>
                         <domain translate="label comment">
                             <label>Zendesk Domain</label>
                             <frontend_type>text</frontend_type>
@@ -80,7 +80,7 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
                         </test>
-                        <use_external_id>
+                        <use_external_id translate="label comment">
                             <label>Use External ID</label>
                             <frontend_type>select</frontend_type>
                             <source_model>adminhtml/system_config_source_yesno</source_model>
@@ -90,6 +90,26 @@
                             <show_in_store>1</show_in_store>
                             <comment><![CDATA[Depending on your Zendesk configuration under "Settings / Security / JSON Web Token / Update of external IDs?" ]]></comment>
                         </use_external_id>
+                        <customer_sync translate="label comment">
+                            <label>Synchronize Customers</label>
+                            <frontend_type>select</frontend_type>
+                            <source_model>adminhtml/system_config_source_yesno</source_model>
+                            <sort_order>6</sort_order>
+                            <show_in_default>1</show_in_default>
+                            <show_in_website>1</show_in_website>
+                            <show_in_store>1</show_in_store>
+                            <comment><![CDATA[Synchronize magento customer accounts with zendesk end-users? ]]></comment>
+                        </customer_sync>
+                        <sync_now translate="button_label comment">
+                            <label></label>
+                            <button_label>Sync All Customers And Create User Fields</button_label>
+                            <frontend_model>zendesk/adminhtml_config_buttons_sync</frontend_model>
+                            <sort_order>7</sort_order>
+                            <show_in_default>1</show_in_default>
+                            <show_in_website>1</show_in_website>
+                            <show_in_store>1</show_in_store>
+                            <comment><![CDATA[Only if customers synchronization is enabled ]]></comment>
+                        </sync_now>
                     </fields>
                 </general>
                 <sso translate="label comment">
@@ -150,53 +170,16 @@
                         </token>
                     </fields>
                 </sso_frontend>
-                <features translate="label">
+                <frontend_features translate="label comment">
                     <expanded>1</expanded>
-                    <label>Features</label>
+                    <label>Customer Frontend</label>
                     <comment>Decide which features you would like turned on in your Magento store.</comment>
                     <frontend_type>text</frontend_type>
                     <sort_order>30</sort_order>
                     <show_in_default>1</show_in_default>
                     <show_in_website>1</show_in_website>
                     <show_in_store>1</show_in_store>
-                    <fields>
-                        <show_on_dashboard translate="label">
-                            <label>Show support tickets on admin dashboard</label>
-                            <frontend_type>select</frontend_type>
-                            <source_model>adminhtml/system_config_source_yesno</source_model>
-                            <sort_order>1</sort_order>
-                            <show_in_default>1</show_in_default>
-                            <show_in_website>1</show_in_website>
-                            <show_in_store>0</show_in_store>
-                        </show_on_dashboard>
-                        <show_views translate="label">
-                            <label>Views to show on dashboards</label>
-                            <frontend_type>multiselect</frontend_type>
-                            <source_model>zendesk/source_views</source_model>
-                            <sort_order>2</sort_order>
-                            <show_in_default>1</show_in_default>
-                            <show_in_website>1</show_in_website>
-                            <show_in_store>0</show_in_store>
-                            <can_be_empty>1</can_be_empty>
-                        </show_views>
-                        <show_on_customer translate="label">
-                            <label>Show support tickets on customer view</label>
-                            <frontend_type>select</frontend_type>
-                            <source_model>adminhtml/system_config_source_yesno</source_model>
-                            <sort_order>3</sort_order>
-                            <show_in_default>1</show_in_default>
-                            <show_in_website>1</show_in_website>
-                            <show_in_store>0</show_in_store>
-                        </show_on_customer>
-                        <show_on_order translate="label">
-                            <label>Show support tickets on order view</label>
-                            <frontend_type>select</frontend_type>
-                            <source_model>adminhtml/system_config_source_yesno</source_model>
-                            <sort_order>4</sort_order>
-                            <show_in_default>1</show_in_default>
-                            <show_in_website>1</show_in_website>
-                            <show_in_store>0</show_in_store>
-                        </show_on_order>
+                    <fields> 
                         <contact_us translate="label">
                             <label>Create tickets from Contact Us form</label>
                             <frontend_type>select</frontend_type>
@@ -247,6 +230,16 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
                         </footer_link_enabled>
+                        <customer_tickets translate="label comment">
+                            <label>Show Tickets in Customer Accounts</label>
+                            <frontend_type>select</frontend_type>
+                            <source_model>adminhtml/system_config_source_yesno</source_model>
+                            <sort_order>20</sort_order>
+                            <show_in_default>1</show_in_default>
+                            <show_in_website>1</show_in_website>
+                            <show_in_store>1</show_in_store>
+                            <comment><![CDATA[Display Customer's tickets in My Account]]></comment>
+                        </customer_tickets>
                         <order_field_id translate="label comment">
                             <label>Zendesk Order Number field ID</label>
                             <frontend_type>text</frontend_type>
@@ -256,18 +249,84 @@
                             <show_in_store>1</show_in_store>
                             <comment><![CDATA[Used to link order in Magento with tickets in Zendesk]]></comment>
                         </order_field_id>
-                        <customer_tickets translate="label comment">
-                            <label>Show Tickets in Customer Accounts</label>
+                    </fields>
+                </frontend_features>
+                <backend_features translate="label comment">
+                    <expanded>1</expanded>
+                    <label>Admin Backend</label>
+                    <comment>Decide which features you would like turned on in your admin panel.</comment>
+                    <frontend_type>text</frontend_type>
+                    <sort_order>35</sort_order>
+                    <show_in_default>1</show_in_default>
+                    <show_in_website>1</show_in_website>
+                    <show_in_store>1</show_in_store>
+                    <fields>
+                        <show_on_order translate="label">
+                            <label>Show support tickets on order view</label>
                             <frontend_type>select</frontend_type>
                             <source_model>adminhtml/system_config_source_yesno</source_model>
-                            <sort_order>20</sort_order>
+                            <sort_order>7</sort_order>
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
-                            <show_in_store>1</show_in_store>
-                            <comment><![CDATA[Display Customer's tickets in My Account]]></comment>
-                        </customer_tickets>
+                            <show_in_store>0</show_in_store>
+                        </show_on_order>   
+                        <show_on_dashboard translate="label">
+                            <label>Show support tickets on admin dashboard</label>
+                            <frontend_type>select</frontend_type>
+                            <source_model>adminhtml/system_config_source_yesno</source_model>
+                            <sort_order>5</sort_order>
+                            <show_in_default>1</show_in_default>
+                            <show_in_website>1</show_in_website>
+                            <show_in_store>0</show_in_store>
+                        </show_on_dashboard>
+                        <show_all translate="label">
+                            <label>Show "All" tab on dashboard</label>
+                            <frontend_type>select</frontend_type>
+                            <source_model>adminhtml/system_config_source_yesno</source_model>
+                            <sort_order>1</sort_order>
+                            <show_in_default>1</show_in_default>
+                            <show_in_website>1</show_in_website>
+                            <show_in_store>0</show_in_store>
+                        </show_all> 
+                        <default_sort translate="label">
+                            <label>Default Sort Order</label>
+                            <frontend_type>select</frontend_type>
+                            <source_model>zendesk/source_sortorder</source_model>
+                            <sort_order>2</sort_order>
+                            <show_in_default>1</show_in_default>
+                            <show_in_website>1</show_in_website>
+                            <show_in_store>0</show_in_store>
+                        </default_sort>
+                        <default_sort_dir translate="label">
+                            <label>Default Sort Direction</label>
+                            <frontend_type>select</frontend_type>
+                            <source_model>zendesk/source_sortdir</source_model>
+                            <sort_order>3</sort_order>
+                            <show_in_default>1</show_in_default>
+                            <show_in_website>1</show_in_website>
+                            <show_in_store>0</show_in_store>
+                        </default_sort_dir>
+                        <show_views translate="label">
+                            <label>Views to show on dashboards</label>
+                            <frontend_type>multiselect</frontend_type>
+                            <source_model>zendesk/source_views</source_model>
+                            <sort_order>4</sort_order>
+                            <show_in_default>1</show_in_default>
+                            <show_in_website>1</show_in_website>
+                            <show_in_store>0</show_in_store>
+                            <can_be_empty>1</can_be_empty>
+                        </show_views>
+                        <show_on_customer translate="label">
+                            <label>Show support tickets on customer view</label>
+                            <frontend_type>select</frontend_type>
+                            <source_model>adminhtml/system_config_source_yesno</source_model>
+                            <sort_order>6</sort_order>
+                            <show_in_default>1</show_in_default>
+                            <show_in_website>1</show_in_website>
+                            <show_in_store>0</show_in_store>
+                        </show_on_customer>
                     </fields>
-                </features>
+                </backend_features>
                 <api translate="label comment">
                     <label>API Details</label>
                     <comment>Required for Magento App inside Zendesk to work.</comment>
@@ -296,7 +355,7 @@
                         </token>
                         <sign_up translate="button_label">
                             <label></label>
-                            <button_label>Generate new token</button_label>
+                            <button_label>Generate New Token</button_label>
                             <frontend_model>zendesk/adminhtml_config_buttons_generate</frontend_model>
                             <sort_order>3</sort_order>
                             <show_in_default>1</show_in_default>
@@ -417,7 +476,7 @@
                     <fields>
                         <sign_up translate="button_label">
                             <label></label>
-                            <button_label>Setup guide</button_label>
+                            <button_label>Setup Guide</button_label>
                             <frontend_model>zendesk/adminhtml_config_buttons_signup</frontend_model>
                             <sort_order>1</sort_order>
                             <show_in_default>1</show_in_default>
diff --git a/src/app/design/adminhtml/default/default/layout/zendesk.xml b/src/app/design/adminhtml/default/default/layout/zendesk.xml
index a0ae8259..3ef3f26a 100644
--- a/src/app/design/adminhtml/default/default/layout/zendesk.xml
+++ b/src/app/design/adminhtml/default/default/layout/zendesk.xml
@@ -1,37 +1,49 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright 2012 Zendesk.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- -->
+* Copyright 2012 Zendesk.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+-->
 <layout>
-	<adminhtml_system_config_edit>
-		<reference name="head">
-			<action method="addCss"><stylesheet>zendesk/zendesk.css</stylesheet></action>
-		</reference>
-	</adminhtml_system_config_edit>
+    <adminhtml_system_config_edit>
+        <reference name="head">
+            <action method="addCss">
+                <stylesheet>zendesk/zendesk.css</stylesheet>
+            </action>
+        </reference>
+    </adminhtml_system_config_edit>
 
     <adminhtml_sales_order_view>
         <reference name="head">
-            <action method="addCss"><stylesheet>zendesk/zendesk.css</stylesheet></action>
+            <action method="addCss">
+                <stylesheet>zendesk/zendesk.css</stylesheet>
+            </action>
         </reference>
         <reference name="content">
             <block type="zendesk/adminhtml_order_view_tickets" name="zendesk_order_view_tickets" after="sales_order_edit"/>
         </reference>
     </adminhtml_sales_order_view>
 
+    <adminhtml_dashboard_index>
+        <reference name="head">
+            <action method="addCss">
+                <stylesheet>zendesk/zendesk.css</stylesheet>
+            </action>
+        </reference>
+    </adminhtml_dashboard_index>
+    
     <adminhtml_customer_edit>
         <reference name="customer_edit_tab_view">
             <block type="adminhtml/template" after="-" name="zendesk.tickets" template="zendesk/customer/tickets.phtml"/>
@@ -39,26 +51,69 @@
     </adminhtml_customer_edit>
     
     <adminhtml_zendesk_index>
+        <reference name="head">
+            <action method="addCss">
+                <stylesheet>zendesk/zendesk.css</stylesheet>
+            </action>
+        </reference>
         <reference name="left">
             <block type="zendesk/adminhtml_menu" name="adminhtml.left.menu">
-                <action method="setActiveItem"><params>dashboard</params></action>
+                <action method="setActiveItem">
+                    <params>dashboard</params>
+                </action>
             </block>
         </reference>
         <reference name="content">
             <block type="zendesk/adminhtml_dashboard" name="zendesk_dashboard">
-                <block type="zendesk/adminhtml_dashboard_grids" name="zendesk_dashboard_grids" />
+                <block type="zendesk/adminhtml_dashboard_grids" name="zendesk_dashboard_grids"/>
+
             </block>
+
         </reference>
     </adminhtml_zendesk_index>
+    <adminhtml_zendesk_create_load_block_order_grid>
+        <reference name="root">
+            <block type="core/text_list" name="content" >
+                <block type="zendesk/adminhtml_create_order_grid" name="grid" />
+            </block>
+        </reference>
+    </adminhtml_zendesk_create_load_block_order_grid>
+    <adminhtml_zendesk_create_load_block_tickets>
+        <reference name="root">
+            <block type="core/text_list" name="content" >
+                <block type="zendesk/adminhtml_dashboard_tab_tickets_grid" name="grid" />
+            </block>
+        </reference>
+    </adminhtml_zendesk_create_load_block_tickets>
+    <adminhtml_zendesk_create_load_block_customer_grid>
+        <reference name="root">
+            <block type="core/text_list" name="content" >
+                <block type="zendesk/adminhtml_create_customer_grid" name="grid" />
+            </block>
+        </reference>
+    </adminhtml_zendesk_create_load_block_customer_grid>        
 
     <adminhtml_zendesk_create>
+        <reference name="head">
+            <action method="addCss">
+                <stylesheet>zendesk/zendesk.css</stylesheet>
+            </action>
+        </reference>
         <reference name="left">
             <block type="zendesk/adminhtml_menu" name="adminhtml.left.menu">
-                <action method="setActiveItem"><params>create</params></action>
+                <action method="setActiveItem">
+                    <params>create</params>
+                </action>
             </block>
         </reference>
         <reference name="content">
             <block type="zendesk/adminhtml_create_edit" name="create"/>
+            <block type="zendesk/adminhtml_create_customer" template="zendesk/create/customer.phtml" name="search">
+                <block type="zendesk/adminhtml_create_customer_grid" name="grid" />
+            </block>
+            <block type="zendesk/adminhtml_create_order" template="zendesk/create/order.phtml" name="order">
+                <block type="zendesk/adminhtml_create_order_grid" name="grid" />
+            </block>
         </reference>
     </adminhtml_zendesk_create>
 
diff --git a/src/app/design/adminhtml/default/default/template/zendesk/config/button-sync.phtml b/src/app/design/adminhtml/default/default/template/zendesk/config/button-sync.phtml
new file mode 100644
index 00000000..4be8dc3b
--- /dev/null
+++ b/src/app/design/adminhtml/default/default/template/zendesk/config/button-sync.phtml
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright 2013 Zendesk.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+?>
+<script type="text/javascript">
+    function sync() {
+        var request = new Ajax.Request('<?php echo $this->getTestUrl(); ?>', {
+            method: 'get',
+
+            onCreate: function() {
+                document.getElementById('zendesk-sync-results').innerHTML = '';
+            },
+            onSuccess: function(transport) {
+                if (transport.responseJSON.success === true) {
+                    var message = '<ul class="messages"><li class="success-msg">' + transport.responseJSON.msg + '</li></ul>';
+                    document.getElementById('zendesk-sync-results').innerHTML = message;
+                } else {
+                    var message = '<ul class="messages"><li class="error-msg">' + transport.responseJSON.msg +
+                              '</li></ul>';
+                    document.getElementById('zendesk-sync-results').innerHTML = message;
+                }
+            }
+        });
+    }
+</script>
+<button style="" onclick="javascript:sync(); return false;" class="scalable" type="button" id="<?php echo $this->getHtmlId() ?>">
+    <span><?php echo $this->escapeHtml($this->getButtonLabel()) ?></span>
+</button>
+<div id="zendesk-sync-results"></div>
+
diff --git a/src/app/design/adminhtml/default/default/template/zendesk/config/button-test-magento.phtml b/src/app/design/adminhtml/default/default/template/zendesk/config/button-test-magento.phtml
index 1747fb45..a0a9483e 100644
--- a/src/app/design/adminhtml/default/default/template/zendesk/config/button-test-magento.phtml
+++ b/src/app/design/adminhtml/default/default/template/zendesk/config/button-test-magento.phtml
@@ -41,4 +41,4 @@
 <button style="" onclick="javascript:checkApiConnection(); return false;" class="scalable" type="button" id="<?php echo $this->getHtmlId() ?>">
     <span><?php echo $this->escapeHtml($this->getButtonLabel()) ?></span>
 </button>
-<div id="zendesk-test-connection-results"></div>
\ No newline at end of file
+<div id="zendesk-test-connection-results"></div>
diff --git a/src/app/design/adminhtml/default/default/template/zendesk/config/button-test-zendesk.phtml b/src/app/design/adminhtml/default/default/template/zendesk/config/button-test-zendesk.phtml
index 1e4c2816..54e2f7a0 100644
--- a/src/app/design/adminhtml/default/default/template/zendesk/config/button-test-zendesk.phtml
+++ b/src/app/design/adminhtml/default/default/template/zendesk/config/button-test-zendesk.phtml
@@ -15,6 +15,28 @@
  * limitations under the License.
  */
 ?>
-<button style="" onclick="setLocation('<?php echo $this->getUrl('adminhtml/zendesk/checkOutbound'); ?>');" class="scalable" type="button" id="<?php echo $this->getHtmlId() ?>">
+<button style="" onclick="javascript:checkZendApiConnection(); return false;" class="scalable" type="button" id="<?php echo $this->getHtmlId() ?>">
     <span><?php echo $this->escapeHtml($this->getButtonLabel()) ?></span>
-</button>
\ No newline at end of file
+</button>
+<script type="text/javascript">
+    function checkZendApiConnection() {
+        var request = new Ajax.Request('<?php echo $this->getUrl('adminhtml/zendesk/checkOutbound'); ?>', {
+            method: 'get',
+            onCreate: function() {
+                document.getElementById('zendesk-api-connection-results').innerHTML = '';
+            },
+            onSuccess: function(transport) {
+                if (transport.responseJSON.success === true) {
+                    var message = '<ul class="messages"><li class="success-msg">' + transport.responseJSON.msg + '</li></ul>';
+                    document.getElementById('zendesk-api-connection-results').innerHTML = message;
+                } else {
+                    var message = '<ul class="messages"><li class="error-msg">' + transport.responseJSON.msg +
+                              '</li></ul>';
+                    document.getElementById('zendesk-api-connection-results').innerHTML = message;
+                }
+            }
+        });
+    }
+</script>
+<div id="zendesk-api-connection-results"></div>
+
diff --git a/src/app/design/adminhtml/default/default/template/zendesk/create/customer.phtml b/src/app/design/adminhtml/default/default/template/zendesk/create/customer.phtml
new file mode 100644
index 00000000..4b2ff71a
--- /dev/null
+++ b/src/app/design/adminhtml/default/default/template/zendesk/create/customer.phtml
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright 2015 Zendesk
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+?>
+<div class="entry-edit">
+    <div class="entry-edit-head">
+        <div class="fright"><?php echo $this->getButtonsHtml() ?></div>
+        <h4 class="fieldset-legend <?php echo ($this->getHeaderCssClass()) ? $this->getHeaderCssClass().' icon-head' : '' ?>"><?php echo $this->getHeaderText() ?></h4>
+    </div>
+    <div class="fieldset">
+        <?php echo $this->getChildHtml('', true, true) ?>
+    </div>
+</div>
+<script>
+document.getElementById('zendesk_create_customer_search_grid').parentNode.style.display = 'none';
+function insertUser(id) {
+        var request = new Ajax.Request('<?php echo $this->getUrl('adminhtml/zendesk/getUser'); ?>'+'id/'+id, {
+            method: 'get',
+            onSuccess: function(transport) {
+                if (transport.responseJSON.success === true) {
+                    document.getElementById('requester_name').value = transport.responseJSON.usr.firstname;
+                    document.getElementById('requester').value = transport.responseJSON.usr.email;
+                    document.getElementById('zendesk_create_customer_search_grid').parentNode.style.display = 'none';
+                    document.getElementById('show-users').style.display = 'block';
+                }
+            }
+        });
+}
+function showUsers() {
+    document.getElementById('zendesk_create_customer_search_grid').parentNode.style.display = 'block';
+    document.getElementById('show-users').style.display = 'none';
+}
+</script>
diff --git a/src/app/design/adminhtml/default/default/template/zendesk/create/order.phtml b/src/app/design/adminhtml/default/default/template/zendesk/create/order.phtml
new file mode 100644
index 00000000..bc1c8986
--- /dev/null
+++ b/src/app/design/adminhtml/default/default/template/zendesk/create/order.phtml
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright 2015 Zendesk
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+?>
+<div style='margin-top: 10px;' class="entry-edit">
+    <div class="entry-edit-head">
+        <div class="fright"><?php echo $this->getButtonsHtml() ?></div>
+        <h4 class="fieldset-legend <?php echo ($this->getHeaderCssClass()) ? $this->getHeaderCssClass().' icon-head' : '' ?>"><?php echo $this->getHeaderText() ?></h4>
+    </div>
+    <div class="fieldset">
+        <?php echo $this->getChildHtml('', true, true) ?>
+    </div>
+</div>
+<script>
+document.getElementById('zendesk_create_order_search_grid').parentNode.className = 'no-display';
+function insertOrder(id) {
+    var request = new Ajax.Request('<?php echo $this->getUrl('adminhtml/zendesk/getOrder'); ?>'+'id/'+id, {
+        method: 'get',
+        onSuccess: function(transport) {
+            if (transport.responseJSON.success === true) {
+                document.getElementById('order').value = transport.responseJSON.order.number;
+                document.getElementById('zendesk_create_order_search_grid').parentNode.className = 'no-display';
+                document.getElementById('show-orders').className = '';
+            }
+        }
+    });
+}
+function showOrders() {
+    document.getElementById('zendesk_create_order_search_grid').parentNode.className = '';
+    document.getElementById('show-orders').className = 'no-display';
+}
+</script>
diff --git a/src/app/design/adminhtml/default/default/template/zendesk/customer/tickets.phtml b/src/app/design/adminhtml/default/default/template/zendesk/customer/tickets.phtml
index 7d3252c0..be70c518 100644
--- a/src/app/design/adminhtml/default/default/template/zendesk/customer/tickets.phtml
+++ b/src/app/design/adminhtml/default/default/template/zendesk/customer/tickets.phtml
@@ -17,7 +17,7 @@
 ?>
 <?php
 
-if(!Mage::getStoreConfig('zendesk/features/show_on_customer')) {
+if(!Mage::getStoreConfig('zendesk/backend_features/show_on_customer')) {
     return;
 }
 
@@ -54,16 +54,16 @@ if($customer = Mage::registry('current_customer')) {
                     </thead>
                     <tbody class="odd">
                         <?php foreach($tickets as $ticket): ?>
-                        <?php $t = Mage::getModel('zendesk/api_tickets')->get($ticket['id'], true); ?>
-                        <tr class="border">
-                            <td><?php echo ucwords($ticket['priority']); ?></td>
-                            <td><a href="<?php echo Mage::helper('zendesk')->getUrl('ticket', $ticket['id']); ?>" target="_blank"><?php echo $ticket['subject']; ?></a></td>
-                            <td><?php echo Mage::helper('core')->formatDate($ticket['created_at'], Mage_Core_Model_Locale::FORMAT_TYPE_MEDIUM, true); ?></td>
-                            <td><?php echo Mage::helper('core')->formatDate($ticket['updated_at'], Mage_Core_Model_Locale::FORMAT_TYPE_MEDIUM, true); ?></td>
-                            <td><?php echo ucwords($ticket['status']); ?></td>
-                            <td><?php echo ($ticket['group_id']) ? $t['group']['name'] : ''; ?></td>
-                            <td><?php echo ($ticket['assignee_id']) ? $t['assignee']['name'] : ''; ?></td>
-                        </tr>
+                            <?php $t = Mage::getModel('zendesk/api_tickets')->get($ticket['id'], true); ?>
+                            <tr class="border">
+                                <td><?php echo ucwords($ticket['priority']); ?></td>
+                                <td><?php echo Mage::helper('zendesk')->getTicketUrl($ticket); ?></td>
+                                <td><?php echo Mage::helper('core')->formatDate($ticket['created_at'], Mage_Core_Model_Locale::FORMAT_TYPE_MEDIUM, true); ?></td>
+                                <td><?php echo Mage::helper('core')->formatDate($ticket['updated_at'], Mage_Core_Model_Locale::FORMAT_TYPE_MEDIUM, true); ?></td>
+                                <td><?php echo ucwords($ticket['status']); ?></td>
+                                <td><?php echo ($ticket['group_id']) ? $t['group']['name'] : ''; ?></td>
+                                <td><?php echo ($ticket['assignee_id']) ? $t['assignee']['name'] : ''; ?></td>
+                            </tr>
                         <?php endforeach; ?>
                     </tbody>
                 </table>
@@ -71,4 +71,4 @@ if($customer = Mage::registry('current_customer')) {
         </div>
     </div>
     <div class="clear"></div>
-<?php endif; ?>
\ No newline at end of file
+<?php endif; ?>
diff --git a/src/app/design/adminhtml/default/default/template/zendesk/dashboard/index.phtml b/src/app/design/adminhtml/default/default/template/zendesk/dashboard/index.phtml
index 5bb3d3af..e21e6df8 100644
--- a/src/app/design/adminhtml/default/default/template/zendesk/dashboard/index.phtml
+++ b/src/app/design/adminhtml/default/default/template/zendesk/dashboard/index.phtml
@@ -15,30 +15,31 @@
  * limitations under the License.
  */
 ?>
-<?php if($this->getIsZendeskDashboard() || Mage::getStoreConfig('zendesk/features/show_on_dashboard')): ?>
-    <?php if($this->getIsZendeskDashboard()): ?>
-        <div class="content-header">
-            <table cellspacing="0">
-                <tr>
-                    <td><h3 class="head-dashboard"><?php echo $this->__('Dashboard') ?></h3></td>
-                </tr>
-            </table>
-        </div>
-    <?php endif; ?>
-    <div class="zendesk_dashboard_container">
-        <?php echo $this->getChildHtml('zendesk_dashboard_grids') ?>
-        <div id="tickets_grid_tab_content"></div>
-
-        <?php if(!$this->getIsZendeskDashboard()): ?>
-            <div class="a-right" style="margin: 6px 0;">
-                <button style="" onclick="setLocation('<?php echo $this->getUrl('adminhtml/zendesk/create'); ?>');" class="scalable" type="button" id="zendesk-create-ticket">
-                    <span><?php echo $this->__('New Support Ticket'); ?></span>
-                </button>
-                <button style="" onclick="setLocation('<?php echo Mage::helper('zendesk')->getUrl(); ?>');" class="scalable" type="button" id="zendesk-view-all">
-                    <span><?php echo $this->__('View All Tickets'); ?></span>
-                </button>
+<?php if( $this->isConnected() ): ?>
+    <?php if ($this->getIsZendeskDashboard() || Mage::getStoreConfig('zendesk/backend_features/show_on_dashboard')): ?>
+        <?php if ($this->getIsZendeskDashboard()): ?>
+            <div class="content-header">
+                <table cellspacing="0">
+                    <tr>
+                        <td><h3 class="head-dashboard"><?php echo $this->__('Dashboard') ?></h3></td>
+                    </tr>
+                </table>
             </div>
         <?php endif; ?>
-    </div>
-    <?php echo $this->getChildHtml('zendesk_dashboard_empty'); ?>
-<?php endif; ?>
\ No newline at end of file
+        <div class="zendesk_dashboard_container">
+            <?php echo $this->getChildHtml('zendesk_dashboard_grids') ?>
+            <div id="tickets_grid_tab_content"></div>
+            <?php if (!$this->getIsZendeskDashboard()): ?>
+                <div class="a-right" style="margin: 6px 0;">
+                    <button style="" onclick="setLocation('<?php echo $this->getUrl('adminhtml/zendesk/create'); ?>');" class="scalable" type="button" id="zendesk-create-ticket">
+                        <span><?php echo $this->__('New Support Ticket'); ?></span>
+                    </button>
+                    <button style="" onclick="setLocation('<?php echo Mage::getSingleton('adminhtml/url')->getUrl('adminhtml/zendesk/launch'); ?>');" class="scalable" type="button" id="zendesk-view-all">
+                        <span><?php echo $this->__('View All Tickets'); ?></span>
+                    </button>
+                </div>
+            <?php endif; ?>
+        </div>
+        <?php echo $this->getChildHtml('zendesk_dashboard_empty'); ?>
+    <?php endif; ?>
+<?php endif; ?>
diff --git a/src/app/design/adminhtml/default/default/template/zendesk/dashboard/tabs/view.phtml b/src/app/design/adminhtml/default/default/template/zendesk/dashboard/tabs/view.phtml
deleted file mode 100644
index 28d114c7..00000000
--- a/src/app/design/adminhtml/default/default/template/zendesk/dashboard/tabs/view.phtml
+++ /dev/null
@@ -1,140 +0,0 @@
-<?php
-/**
- * Copyright 2012 Zendesk.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-?>
-<?php
-$view = $this->getView();
-
-if($view) {
-    try {
-        $execute = Mage::getModel('zendesk/api_views')->execute($view['id']);
-
-        $columns = $execute['columns'];
-        $rows = $execute['rows'];
-
-        $isScoped = Mage::getModel('customer/customer')->getSharingConfig()->isWebsiteScope();
-
-        $users = array();
-        $magentoUsers = array();
-
-        if(isset($execute['users'])) {
-            foreach($execute['users'] as $user) {
-                $users[$user['id']] = $user['name'];
-
-                // TODO: Re-enable once the results can be cached, to reduce the significant performance impact
-//                if(!$isScoped && !isset($magentoUsers[$user['id']])) {
-//                    $info = Mage::getModel('zendesk/api_users')->get($user['id']);
-//                    $customer = Mage::getModel('customer/customer')->loadByEmail($info['email']);
-//
-//                    if($customer && $customer->getId()) {
-//                        $magentoUsers[$user['id']] = $customer->getId();
-//                    } else {
-//                        $magentoUsers[$user['id']] = false;
-//                    }
-//                }
-            }
-        }
-
-        if(isset($execute['groups'])) {
-            $groups = array();
-            foreach($execute['groups'] as $group) {
-                $groups[$group['id']] = $group['name'];
-            }
-        }
-    } catch(Exception $e) {
-        // Most likely the Zendesk domain has not been configured, so just don't show anything here.
-        $view = null;
-    }
-}
-?>
-<?php if($view): ?>
-<div class="grid np">
-    <table cellspacing="0" class="data order-tables">
-        <thead>
-            <tr class="headings">
-                <?php foreach($columns as $col): ?>
-                    <?php if($col['id'] === 'score') continue; ?>
-                    <th class="<?php echo $col['id']; ?>"><?php echo Mage::helper('zendesk')->__($col['title']); ?></th>
-                <?php endforeach; ?>
-            </tr>
-        </thead>
-        <tbody>
-            <?php if ($rows): ?>
-                <?php $i = 0; ?>
-                <?php foreach ($rows as $row): ?>
-                    <tr class="border <?php echo (++$i % 2) ? 'even' : 'odd'; ?>">
-                        <?php foreach($columns as $col): ?>
-                            <?php
-                                if($col['id'] === 'score') continue;
-
-                                $value = isset($row[$col['id']]) ? $row[$col['id']] : null;
-
-                                if($value === null) {
-                                    // Attempt to match on a modified column name, which might happen for users in
-                                    // particular
-                                    $value = $row[$col['id'] . '_id'];
-                                }
-
-                                switch($col['id']) {
-                                    case 'subject':
-                                        if(isset($row['ticket']) && isset($row['ticket']['id'])) {
-                                            $url = Mage::helper('zendesk')->getUrl('ticket', $row['ticket']['id']);
-                                            $value = '<a href="' . $url . '" target="_blank">' . $value . '</a>';
-                                        }
-                                        break;
-
-                                    case 'requester':
-                                    case 'assignee':
-                                        $name = $value;
-
-                                        if(isset($users[$value])) {
-                                            $name = $users[$value];
-                                        }
-
-                                        if(isset($magentoUsers[$value]) && $magentoUsers[$value] !== false) {
-                                            $url = $this->getUrl('adminhtml/customer/edit', array('id' => $magentoUsers[$value]));
-                                            $value = '<a href="' . $url . '">' . $name . '</a>';
-                                        } else {
-                                            $value = $name;
-                                        }
-                                        break;
-
-                                    case 'created':
-                                    case 'updated':
-                                        $value = Mage::helper('core')->formatDate($value, Mage_Core_Model_Locale::FORMAT_TYPE_MEDIUM, true);
-                                        break;
-
-                                    case 'group':
-                                        if(isset($groups[$value])) {
-                                            $value = $groups[$value];
-                                        }
-                                        break;
-                                }
-                            ?>
-                            <td><?php echo $value; ?></td>
-                        <?php endforeach; ?>
-                    </tr>
-                <?php endforeach; ?>
-            <?php else: ?>
-                <tr>
-                    <td class="empty-text a-center" colspan="100"><?php echo Mage::helper('zendesk')->__('No tickets found'); ?></td>
-                </tr>
-            <?php endif; ?>
-        </tbody>
-    </table>
-</div>
-<div class="clear"></div>
-<?php endif; ?>
\ No newline at end of file
diff --git a/src/app/design/adminhtml/default/default/template/zendesk/left-menu.phtml b/src/app/design/adminhtml/default/default/template/zendesk/left-menu.phtml
index 152b235d..9b0570fa 100644
--- a/src/app/design/adminhtml/default/default/template/zendesk/left-menu.phtml
+++ b/src/app/design/adminhtml/default/default/template/zendesk/left-menu.phtml
@@ -33,7 +33,7 @@
     <?php } ?>
     <?php if ($this->isAllowed('launch')) { ?>
     <li>
-        <a href="<?php echo Mage::helper('zendesk')->getUrl(); ?>" target="_blank" class="tab-item-link">
+        <a href="<?php echo Mage::getSingleton('adminhtml/url')->getUrl('adminhtml/zendesk/launch'); ?>" target="_blank" class="tab-item-link">
             <span><?php echo $this->__('Launch Zendesk'); ?></span>
         </a>
     </li>
@@ -41,8 +41,9 @@
     <?php if ($this->isAllowed('settings')) { ?>
     <li>
         <a href="<?php echo $this->getUrl('adminhtml/system_config/edit/section/zendesk'); ?>" class="tab-item-link">
-            <span><?php echo $this->__('Settings'); ?></span>
+            <span><?php echo $this->__('Configuration'); ?></span>
         </a>
     </li>
     <?php } ?>
 </ul>
+
diff --git a/src/app/design/adminhtml/default/default/template/zendesk/order/tickets.phtml b/src/app/design/adminhtml/default/default/template/zendesk/order/tickets.phtml
index 531f54fd..4ded847b 100644
--- a/src/app/design/adminhtml/default/default/template/zendesk/order/tickets.phtml
+++ b/src/app/design/adminhtml/default/default/template/zendesk/order/tickets.phtml
@@ -17,7 +17,7 @@
 ?>
 <?php
 
-if(!Mage::getStoreConfig('zendesk/features/show_on_order')) {
+if(!Mage::getStoreConfig('zendesk/backend_features/show_on_order')) {
     return;
 }
 
diff --git a/src/app/design/adminhtml/default/default/template/zendesk/tickets/tickets.phtml b/src/app/design/adminhtml/default/default/template/zendesk/tickets/tickets.phtml
new file mode 100644
index 00000000..6605ec27
--- /dev/null
+++ b/src/app/design/adminhtml/default/default/template/zendesk/tickets/tickets.phtml
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Copyright 2012 Zendesk.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+?>
+<?php
+
+if(!Mage::getStoreConfig('zendesk/backend_features/show_on_customer')) {
+    return;
+}
+
+$tickets = null;
+if($customer = Mage::registry('current_customer')) {
+    try {
+        $tickets = Mage::getModel('zendesk/api_tickets')->forRequester($customer->getEmail());
+    } catch(Exception $e) {
+        // Don't do anything, just don't show the tickets
+    }
+}
+?>
+<?php if($tickets): ?>
+    <div class="clear"></div>
+    <br/>
+    <div class="entry-edit">
+        <div class="entry-edit-head">
+            <h4 class="icon-head head-account"><?php echo Mage::helper('zendesk')->__('Support Tickets') ?></h4>
+        </div>
+        <div class="grid">
+            <div class="hor-scroll">
+                <table cellspacing="0" class="data order-tables">
+                    <thead>
+                        <tr class="headings">
+                            <th><?php echo Mage::helper('zendesk')->__('Priority') ?></th>
+                            <th><?php echo Mage::helper('zendesk')->__('Subject') ?></th>
+                            <th><?php echo Mage::helper('zendesk')->__('Requested') ?></th>
+                            <th><?php echo Mage::helper('zendesk')->__('Updated') ?></th>
+                            <th><?php echo Mage::helper('zendesk')->__('Status') ?></th>
+                            <th><?php echo Mage::helper('zendesk')->__('Group') ?></th>
+                            <th><?php echo Mage::helper('zendesk')->__('Assignee') ?></th>
+                        </tr>
+                    </thead>
+                    <tbody class="odd">
+                        <?php foreach($tickets as $ticket): ?>
+                        <?php $t = Mage::getModel('zendesk/api_tickets')->get($ticket['id'], true); ?>
+                        <tr class="border">
+                            <td><?php echo ucwords($ticket['priority']); ?></td>
+                            <td><a href="<?php echo Mage::helper('zendesk')->getTicketUrl($ticket); ?>" target="_blank"><?php echo $ticket['subject']; ?></a></td>
+                            <td><?php echo Mage::helper('core')->formatDate($ticket['created_at'], Mage_Core_Model_Locale::FORMAT_TYPE_MEDIUM, true); ?></td>
+                            <td><?php echo Mage::helper('core')->formatDate($ticket['updated_at'], Mage_Core_Model_Locale::FORMAT_TYPE_MEDIUM, true); ?></td>
+                            <td><?php echo ucwords($ticket['status']); ?></td>
+                            <td><?php echo ($ticket['group_id']) ? $t['group']['name'] : ''; ?></td>
+                            <td><?php echo ($ticket['assignee_id']) ? $t['assignee']['name'] : ''; ?></td>
+                        </tr>
+                        <?php endforeach; ?>
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+    <div class="clear"></div>
+<?php endif; ?>
diff --git a/src/app/design/adminhtml/default/default/template/zendesk/widget/grid.phtml b/src/app/design/adminhtml/default/default/template/zendesk/widget/grid.phtml
new file mode 100644
index 00000000..ef7fb9e1
--- /dev/null
+++ b/src/app/design/adminhtml/default/default/template/zendesk/widget/grid.phtml
@@ -0,0 +1,214 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License (AFL 3.0)
+ * that is bundled with this package in the file LICENSE_AFL.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/afl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    design
+ * @package     default_default
+ * @copyright   Copyright (c) 2014 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+ */
+?>
+<?php
+/**
+ * Template for Mage_Adminhtml_Block_Widget_Grid
+ *
+ *  getId()
+ *  getCollection()
+ *  getColumns()
+ *  getPagerVisibility()
+ *  getVarNamePage()
+ */
+$numColumns = sizeof($this->getColumns());
+?>
+<?php if($this->getCollection()): ?>
+    <?php if($this->canDisplayContainer()): ?>
+        <?php if($this->getGridHeader()): ?>
+        <div class="content-header">
+            <table cellspacing="0">
+                <tr>
+                    <td style="width:50%;"><h2><?php echo $this->getGridHeader(); ?></h2></td>
+                </tr>
+            </table>
+        </div>
+        <?php endif ?>
+
+        <div id="<?php echo $this->getId() ?>">
+    <?php else: ?>
+        <?php echo $this->getMessagesBlock()->getGroupedHtml() ?>
+    <?php endif; ?>
+<?php if($this->getPagerVisibility() || $this->getExportTypes() || $this->getFilterVisibility()): ?>
+    <table cellspacing="0" class="actions">
+        <tr>
+        <?php if($this->getPagerVisibility()): ?>
+            <td class="pager">
+            <?php echo $this->__('Page') ?>
+
+            <?php $_curPage  = $this->getCollection()->getCurPage() ?>
+            <?php $_lastPage = $this->getCollection()->getLastPageNumber() ?>
+            <?php if($_curPage>1): ?>
+                <a href="#" title="<?php echo $this->__('Previous page') ?>" onclick="<?php echo $this->getJsObjectName() ?>.setPage('<?php echo ($_curPage-1) ?>');return false;"><img src="<?php echo $this->getSkinUrl('images/pager_arrow_left.gif') ?>" alt="Go to Previous page" class="arrow"/></a>
+            <?php else: ?>
+                <img src="<?php echo $this->getSkinUrl('images/pager_arrow_left_off.gif') ?>" alt="Go to Previous page" class="arrow"/>
+            <?php endif; ?>
+
+            <input type="text" name="<?php echo $this->getVarNamePage() ?>" value="<?php echo $_curPage ?>" class="input-text page" onkeypress="<?php echo $this->getJsObjectName() ?>.inputPage(event, '<?php echo $_lastPage ?>')"/>
+
+            <?php if($_curPage < $_lastPage): ?>
+                <a href="#" title="<?php echo $this->__('Next page') ?>" onclick="<?php echo $this->getJsObjectName() ?>.setPage('<?php echo ($_curPage+1) ?>');return false;"><img src="<?php echo $this->getSkinUrl('images/pager_arrow_right.gif') ?>" alt="Go to Next page" class="arrow"/></a>
+            <?php else: ?>
+                <img src="<?php echo $this->getSkinUrl('images/pager_arrow_right_off.gif') ?>" alt="Go to Previous page" class="arrow"/>
+            <?php endif; ?>
+
+            <?php echo $this->__('of %s pages', $this->getCollection()->getLastPageNumber()) ?>
+            <span class="separator">|</span>
+            <?php echo $this->__('View') ?>
+            <select name="<?php echo $this->getVarNameLimit() ?>" onchange="<?php echo $this->getJsObjectName() ?>.loadByElement(this)">
+                <option value="20"<?php if($this->getCollection()->getPageSize()==20): ?> selected="selected"<?php endif; ?>>20</option>
+                <option value="30"<?php if($this->getCollection()->getPageSize()==30): ?> selected="selected"<?php endif; ?>>30</option>
+                <option value="50"<?php if($this->getCollection()->getPageSize()==50): ?> selected="selected"<?php endif; ?>>50</option>
+                <option value="100"<?php if($this->getCollection()->getPageSize()==100): ?> selected="selected"<?php endif; ?>>100</option>
+            </select>
+            <?php echo $this->__('per page') ?><span class="separator">|</span>
+            <?php echo $this->__('Total %d records found', $this->getCollection()->getSize()) ?>
+            <span id="<?php echo $this->getHtmlId() ?>-total-count" class="no-display"><?php echo $this->getCollection()->getSize() ?></span>
+            <?php if($this->getRssLists()): ?>
+                <?php foreach ($this->getRssLists() as $_rss): ?>
+                <span class="separator">|</span><a href="<?php echo $_rss->getUrl() ?>" class="link-feed"><?php echo $_rss->getLabel() ?></a>
+                <?php endforeach ?>
+            <?php endif; ?>
+        </td>
+    <?php endif ?>
+    <?php if($this->getExportTypes()): ?>
+        <td class="export a-right">
+            <img src="<?php echo $this->getSkinUrl('images/icon_export.gif') ?>" alt="" class="v-middle"/>&nbsp; <?php echo $this->__('Export to:') ?>
+            <select name="<?php echo $this->getId() ?>_export" id="<?php echo $this->getId() ?>_export" style="width:8em;">
+            <?php foreach ($this->getExportTypes() as $_type): ?>
+                <option value="<?php echo $_type->getUrl() ?>"><?php echo $_type->getLabel() ?></option>
+            <?php endforeach; ?>
+            </select>
+            <?php echo $this->getExportButtonHtml() ?>
+        </td>
+    <?php endif; ?>
+        <td class="filter-actions a-right">
+            <?php echo $this->getMainButtonsHtml() ?>
+        </td>
+        </tr>
+    </table>
+<?php endif; ?>
+<?php 
+if($this->getMassactionBlock()->isAvailable()){
+    echo $this->getMassactionBlockHtml();
+} 
+?>
+<div class="grid">
+    <div class="hor-scroll">
+    <table cellspacing="0" class="data" id="<?php echo $this->getId() ?>_table">
+        <?php foreach ($this->getColumns() as $_column): ?>
+        <col <?php echo $_column->getHtmlProperty() ?> />
+        <?php endforeach; ?>
+        <?php if ($this->getHeadersVisibility() || $this->getFilterVisibility()): ?>
+            <thead>
+                <?php if ($this->getHeadersVisibility()): ?>
+                    <tr class="headings">
+                    <?php foreach ($this->getColumns() as $_column): ?>
+                        <th<?php echo $_column->getHeaderHtmlProperty() ?>><span class="nobr"><?php echo $_column->getHeaderHtml() ?></span></th>
+                    <?php endforeach; ?>
+                    </tr>
+                <?php endif; ?>
+                <?php if ($this->getFilterVisibility()): ?>
+                    <tr class="filter">
+                    <?php $i=0;foreach ($this->getColumns() as $_column): ?>
+                        <th<?php echo $_column->getHeaderHtmlProperty() ?>><?php echo $_column->getFilterHtml() ?></th>
+                    <?php endforeach; ?>
+                    </tr>
+                <?php endif ?>
+            </thead>
+        <?php endif; ?>
+        <?php if ($this->getCountTotals()): ?>
+            <tfoot>
+                <tr class="totals">
+                <?php foreach ($this->getColumns() as $_column): ?>
+                    <th class="<?php echo $_column->getCssProperty() ?>"><?php echo ($_column->hasTotalsLabel()) ? $_column->getTotalsLabel() : $_column->getRowField($_column->getGrid()->getTotals()) ?>&nbsp;</th>
+                <?php endforeach; ?>
+                </tr>
+            </tfoot>
+        <?php endif; ?>
+
+        <tbody>
+        <?php if (($this->getCollection()->getSize()>0) && (!$this->getIsCollapsed())): ?>
+        <?php foreach ($this->getCollection() as $_index=>$_item): ?>
+            <tr  class="zendesk-grid-tr <?php if ($_class = $this->getRowClass($_item)):?><?php echo $_class; ?><?php endif;?>" >
+            <?php $i=0;foreach ($this->getColumns() as $_column): ?>
+
+                <?php if ($this->shouldRenderCell($_item, $_column)):?>
+                    <?php $_rowspan = $this->getRowspan($_item, $_column);?>
+                    <td <?php echo ($_rowspan ? 'rowspan="' . $_rowspan . '" ' : '') ?>class="<?php echo $_column->getCssProperty() ?> <?php echo ++$i==$numColumns?'last':'' ?>">
+                        <?php echo (($_html = $_column->getRowField($_item)) != '' ? $_html : '&nbsp;') ?>
+                    </td>
+                    <?php if ($this->shouldRenderEmptyCell($_item, $_column)):?>
+                        <td colspan="<?php echo $this->getEmptyCellColspan($_item)?>" class="last"><?php echo $this->getEmptyCellLabel()?></td>
+                    <?php endif;?>
+                <?php endif;?>
+
+            <?php endforeach; ?>
+            </tr>
+            <?php if ($_multipleRows = $this->getMultipleRows($_item)):?>
+                <?php foreach ($_multipleRows as $_i):?>
+                <tr>
+                    <?php $i=0;foreach ($this->getMultipleRowColumns($_i) as $_column): ?>
+                        <td class="<?php echo $_column->getCssProperty() ?> <?php echo ++$i==$numColumns-1?'last':'' ?>">
+                            <?php echo (($_html = $_column->getRowField($_i)) != '' ? $_html : '&nbsp;') ?>
+                        </td>
+                    <?php endforeach; ?>
+                </tr>
+                <?php endforeach;?>
+            <?php endif;?>
+
+            <?php if ($this->shouldRenderSubTotal($_item)): ?>
+                <tr class="subtotals">
+                    <?php $i=0;foreach ($this->getSubTotalColumns() as $_column): ?>
+                        <td class="<?php echo $_column->getCssProperty() ?> <?php echo ++$i == $numColumns ? 'last' : '' ?>">
+                            <?php echo ($_column->hasSubtotalsLabel() ? $_column->getSubtotalsLabel() :
+                                $_column->getRowField($this->getSubTotalItem($_item))
+                            );
+                            ?>
+                        </td>
+                    <?php endforeach; ?>
+                </tr>
+            <?php endif; ?>
+        <?php endforeach; ?>
+        <?php elseif ($this->getEmptyText()): ?>
+            <tr>
+                <td class="empty-text <?php echo $this->getEmptyTextClass() ?>" colspan="<?php echo $numColumns ?>"><?php echo $this->getEmptyText() ?></td>
+            </tr>
+        <?php endif; ?>
+        </tbody>
+
+    </table>
+    </div>
+</div>
+<?php if($this->canDisplayContainer()): ?>
+</div>
+<script type="text/javascript">
+//<![CDATA[
+    <?php echo $this->getGridJavascript() ?>
+//]]>
+</script>
+<?php endif; ?>
+<?php endif; ?>
diff --git a/src/app/design/frontend/base/default/layout/zendesk.xml b/src/app/design/frontend/base/default/layout/zendesk.xml
index 3e7d7c98..2718945a 100644
--- a/src/app/design/frontend/base/default/layout/zendesk.xml
+++ b/src/app/design/frontend/base/default/layout/zendesk.xml
@@ -19,7 +19,7 @@
 <layout>
     <default>
         <reference name="footer_links">
-            <action method="addLink" translate="label title" module="contacts" ifconfig="zendesk/features/footer_link_enabled">
+            <action method="addLink" translate="label title" module="contacts" ifconfig="zendesk/frontend_features/footer_link_enabled">
                 <label>Support</label>
                 <url>zendesk</url>
                 <title>Support</title>
@@ -33,7 +33,7 @@
 
     <customer_account>
         <reference name="customer_account_navigation">
-            <action method="addLink" ifconfig="zendesk/features/customer_tickets" translate="label" module="zendesk">
+            <action method="addLink" ifconfig="zendesk/frontend_features/customer_tickets" translate="label" module="zendesk">
                 <name>customertickets</name>
                 <path>zendesk/customer_tickets/index</path>
                 <label>My Tickets</label>
@@ -49,5 +49,6 @@
             </block>
         </reference>
     </zendesk_customer_tickets_index>
-
-</layout>
\ No newline at end of file
+    <zendesk_sso_login>
+    </zendesk_sso_login>
+</layout>
diff --git a/src/app/design/frontend/base/default/template/zendesk/customer/tickets.phtml b/src/app/design/frontend/base/default/template/zendesk/customer/tickets.phtml
index fbc0b04a..d804ff6d 100644
--- a/src/app/design/frontend/base/default/template/zendesk/customer/tickets.phtml
+++ b/src/app/design/frontend/base/default/template/zendesk/customer/tickets.phtml
@@ -17,7 +17,7 @@
 ?>
 
 <?php
-    if(!Mage::getStoreConfig('zendesk/features/customer_tickets')) {
+    if(!Mage::getStoreConfig('zendesk/frontend_features/customer_tickets')) {
         return;
     }
 ?>
@@ -28,4 +28,8 @@
     </div>
 
     <div><?php echo $this->getChildHtml(); ?></div>
-</div>
\ No newline at end of file
+</div>
+<div class="buttons-set">
+    <a class="button" target="_blank" href="<?php echo $this->getSubmitAction() ?>"><span><span><?php echo $this->__('Open Ticket') ?></span></span></a>
+    <a class="button" target="_blank" href="<?php echo Mage::helper('zendesk')->getSSOAuthUrlEndUsers(); ?>"><span><span><?php echo $this->__('Log In To Zendesk') ?></span></span></a>
+</div>
diff --git a/src/app/design/frontend/base/default/template/zendesk/customer/tickets/list.phtml b/src/app/design/frontend/base/default/template/zendesk/customer/tickets/list.phtml
index e16f497a..6b89baf0 100644
--- a/src/app/design/frontend/base/default/template/zendesk/customer/tickets/list.phtml
+++ b/src/app/design/frontend/base/default/template/zendesk/customer/tickets/list.phtml
@@ -38,7 +38,7 @@
                     <?php foreach($tickets as $ticket): ?>
                         <?php $t = Mage::getModel('zendesk/api_tickets')->get($ticket['id'], true); ?>
                         <tr class="border">
-                            <td><a href="<?php echo Mage::helper('zendesk')->getUrl('ticket', $ticket['id']); ?>" target="_blank"><?php echo $ticket['subject']; ?></a></td>
+                            <td><?php echo Mage::helper('zendesk')->getTicketUrl($ticket); ?></td>
                             <td><?php echo Mage::helper('core')->formatDate($ticket['created_at'], Mage_Core_Model_Locale::FORMAT_TYPE_MEDIUM, true); ?></td>
                             <td><?php echo Mage::helper('core')->formatDate($ticket['updated_at'], Mage_Core_Model_Locale::FORMAT_TYPE_MEDIUM, true); ?></td>
                             <td><?php echo ucwords($ticket['status']); ?></td>
diff --git a/src/app/locale/da_DA/Zendesk_Zendesk.csv b/src/app/locale/da_DA/Zendesk_Zendesk.csv
index a6764ce5..06a46a07 100644
--- a/src/app/locale/da_DA/Zendesk_Zendesk.csv
+++ b/src/app/locale/da_DA/Zendesk_Zendesk.csv
@@ -41,7 +41,7 @@
 "Normal","Normal"
 "On-hold","I bero"
 "Open","Åben"
-"Order number","Ordrenummer"
+"Order Number","Ordrenummer"
 "Pending","Venter"
 "Priority","Prioritet"
 "Problem","Problem"
diff --git a/src/app/locale/de_DE/Zendesk_Zendesk.csv b/src/app/locale/de_DE/Zendesk_Zendesk.csv
index e39b8209..0152675c 100644
--- a/src/app/locale/de_DE/Zendesk_Zendesk.csv
+++ b/src/app/locale/de_DE/Zendesk_Zendesk.csv
@@ -41,7 +41,7 @@
 "Normal","Normal"
 "On-hold","Angehalten"
 "Open","Offen"
-"Order number","Bestellnummer"
+"Order Number","Bestellnummer"
 "Pending","Wartend"
 "Priority","Priorität"
 "Problem","Problem"
diff --git a/src/app/locale/en_CA/Zendesk_Zendesk.csv b/src/app/locale/en_CA/Zendesk_Zendesk.csv
index fe2823a3..3d8e534d 100644
--- a/src/app/locale/en_CA/Zendesk_Zendesk.csv
+++ b/src/app/locale/en_CA/Zendesk_Zendesk.csv
@@ -41,7 +41,7 @@
 "Normal","Normal"
 "On-hold","On-hold"
 "Open","Open"
-"Order number","Order number"
+"Order Number","Order Number"
 "Pending","Pending"
 "Priority","Priority"
 "Problem","Problem"
diff --git a/src/app/locale/en_GB/Zendesk_Zendesk.csv b/src/app/locale/en_GB/Zendesk_Zendesk.csv
index fe5d40ee..f271955b 100644
--- a/src/app/locale/en_GB/Zendesk_Zendesk.csv
+++ b/src/app/locale/en_GB/Zendesk_Zendesk.csv
@@ -41,7 +41,7 @@
 "Normal","Normal"
 "On-hold","On-hold"
 "Open","Open"
-"Order number","Order number"
+"Order Number","Order Number"
 "Pending","Pending"
 "Priority","Priority"
 "Problem","Problem"
diff --git a/src/app/locale/en_US/Zendesk_Zendesk.csv b/src/app/locale/en_US/Zendesk_Zendesk.csv
index b4ae4f85..64f012db 100644
--- a/src/app/locale/en_US/Zendesk_Zendesk.csv
+++ b/src/app/locale/en_US/Zendesk_Zendesk.csv
@@ -41,7 +41,7 @@
 "Normal","Normal"
 "On-hold","On-hold"
 "Open","Open"
-"Order number","Order number"
+"Order Number","Order Number"
 "Pending","Pending"
 "Priority","Priority"
 "Problem","Problem"
@@ -96,3 +96,16 @@
 "Zendesk SSO token not been set. Please add this to the settings page.","Zendesk SSO token not been set. Please add this to the settings page."
 "Zendesk allows your customers to contact you using the methods they prefer. Use the links below to configure the channels you would like to use.","Zendesk allows your customers to contact you using the methods they prefer. Use the links below to configure the channels you would like to use."
 "Zendesk domain not set. Please add this to the settings page.","Zendesk domain not set. Please add this to the settings page."
+"Use External ID","Use External ID"
+"Depending on your Zendesk configuration under "Settings / Security / JSON Web Token / Update of external IDs?","Depending on your Zendesk configuration under "Settings / Security / JSON Web Token / Update of external IDs?"
+"Synchronize Customers","Synchronize Customers"
+"Synchronize magento customer accounts with zendesk end-users?","Synchronize magento customer accounts with zendesk end-users?"
+"Sync All Customers And Create User Fields","Sync All Customers And Create User Fields"
+"Only if customers synchronization is enabled ","Only if customers synchronization is enabled "
+"Customer Frontend","Customer Frontend"
+"Show Tickets in Customer Accounts","Show Tickets in Customer Accounts"
+"Display Customer's tickets in My Account","Display Customer's tickets in My Account"
+"Admin Backend","Admin Backend"
+"Decide which features you would like turned on in your admin panel.","Decide which features you would like turned on in your admin panel."
+"Show "All" tab on dashboard","Show "All" tab on dashboard"
+"Generate New Token","Generate New Token"
diff --git a/src/app/locale/en_US/Zendesk_Zendesk.yml b/src/app/locale/en_US/Zendesk_Zendesk.yml
index 55f177c2..8c699629 100644
--- a/src/app/locale/en_US/Zendesk_Zendesk.yml
+++ b/src/app/locale/en_US/Zendesk_Zendesk.yml
@@ -333,7 +333,7 @@ parts:
   - translation:
         key: "txt.integrations.magento.tickets.order_number"
         title: "Label for order number field"
-        value: "Order number"
+        value: "Order Number"
   - translation:
         key: "txt.integrations.magento.tickets.description"
         title: "Label for the description of a ticket"
diff --git a/src/app/locale/es_419/Zendesk_Zendesk.csv b/src/app/locale/es_419/Zendesk_Zendesk.csv
index 9bdf9a5e..5d201724 100644
--- a/src/app/locale/es_419/Zendesk_Zendesk.csv
+++ b/src/app/locale/es_419/Zendesk_Zendesk.csv
@@ -41,7 +41,7 @@
 "Normal","Normal"
 "On-hold","En espera"
 "Open","Abierto"
-"Order number","Número de pedido"
+"Order Number","Número de pedido"
 "Pending","Pendiente"
 "Priority","Prioridad"
 "Problem","Problema"
diff --git a/src/app/locale/es_ES/Zendesk_Zendesk.csv b/src/app/locale/es_ES/Zendesk_Zendesk.csv
index 1869375e..ac4546f0 100644
--- a/src/app/locale/es_ES/Zendesk_Zendesk.csv
+++ b/src/app/locale/es_ES/Zendesk_Zendesk.csv
@@ -41,7 +41,7 @@
 "Normal","Normal"
 "On-hold","En espera"
 "Open","Abierto"
-"Order number","Número de pedido"
+"Order Number","Número de pedido"
 "Pending","Pendiente"
 "Priority","Prioridad"
 "Problem","Problema"
diff --git a/src/app/locale/fr_CA/Zendesk_Zendesk.csv b/src/app/locale/fr_CA/Zendesk_Zendesk.csv
index fc92f6ee..61e5257c 100644
--- a/src/app/locale/fr_CA/Zendesk_Zendesk.csv
+++ b/src/app/locale/fr_CA/Zendesk_Zendesk.csv
@@ -41,7 +41,7 @@
 "Normal","Normale"
 "On-hold","En pause"
 "Open","Ouvert"
-"Order number","Numéro de commande"
+"Order Number","Numéro de commande"
 "Pending","En attente"
 "Priority","Priorité"
 "Problem","Problème"
diff --git a/src/app/locale/fr_FR/Zendesk_Zendesk.csv b/src/app/locale/fr_FR/Zendesk_Zendesk.csv
index e5f281b5..f8aed62d 100644
--- a/src/app/locale/fr_FR/Zendesk_Zendesk.csv
+++ b/src/app/locale/fr_FR/Zendesk_Zendesk.csv
@@ -41,7 +41,7 @@
 "Normal","Normale"
 "On-hold","En pause"
 "Open","Ouvert"
-"Order number","Numéro de commande"
+"Order Number","Numéro de commande"
 "Pending","En attente"
 "Priority","Priorité"
 "Problem","Problème"
diff --git a/src/app/locale/it_IT/Zendesk_Zendesk.csv b/src/app/locale/it_IT/Zendesk_Zendesk.csv
index 16075c13..c0f428d6 100644
--- a/src/app/locale/it_IT/Zendesk_Zendesk.csv
+++ b/src/app/locale/it_IT/Zendesk_Zendesk.csv
@@ -41,7 +41,7 @@
 "Normal","Normale"
 "On-hold","In sospeso"
 "Open","Aperto"
-"Order number","Numero ordine"
+"Order Number","Numero ordine"
 "Pending","In attesa"
 "Priority","Priorità"
 "Problem","Problema"
diff --git a/src/app/locale/ja_JA/Zendesk_Zendesk.csv b/src/app/locale/ja_JA/Zendesk_Zendesk.csv
index 01191d0d..a2820b15 100644
--- a/src/app/locale/ja_JA/Zendesk_Zendesk.csv
+++ b/src/app/locale/ja_JA/Zendesk_Zendesk.csv
@@ -41,7 +41,7 @@
 "Normal","普通"
 "On-hold","待機中"
 "Open","オープン"
-"Order number","注文番号"
+"Order Number","注文番号"
 "Pending","保留中"
 "Priority","優先度"
 "Problem","問題"
diff --git a/src/app/locale/ja_JP/Zendesk_Zendesk.csv b/src/app/locale/ja_JP/Zendesk_Zendesk.csv
index ac3783f6..7b25563c 100644
--- a/src/app/locale/ja_JP/Zendesk_Zendesk.csv
+++ b/src/app/locale/ja_JP/Zendesk_Zendesk.csv
@@ -51,7 +51,7 @@
 "Group","グループ"
 "New Support Ticket","新規サポートチケット"
 "No tickets found","該当するチケットがありません"
-"Order number","注文番号"
+"Order Number","注文番号"
 "Priority","優先度"
 "High","高"
 "Low","低"
diff --git a/src/app/locale/ko_KO/Zendesk_Zendesk.csv b/src/app/locale/ko_KO/Zendesk_Zendesk.csv
index 9047e6e6..d2dcfd9d 100644
--- a/src/app/locale/ko_KO/Zendesk_Zendesk.csv
+++ b/src/app/locale/ko_KO/Zendesk_Zendesk.csv
@@ -41,7 +41,7 @@
 "Normal","보통"
 "On-hold","대기"
 "Open","등록"
-"Order number","주문 번호"
+"Order Number","주문 번호"
 "Pending","보류"
 "Priority","우선 순위"
 "Problem","문제"
diff --git a/src/app/locale/ko_KR/Zendesk_Zendesk.csv b/src/app/locale/ko_KR/Zendesk_Zendesk.csv
index 10cb78e1..cef14986 100644
--- a/src/app/locale/ko_KR/Zendesk_Zendesk.csv
+++ b/src/app/locale/ko_KR/Zendesk_Zendesk.csv
@@ -51,7 +51,7 @@
 "Group","그룹"
 "New Support Ticket","새 지원 티켓"
 "No tickets found","티켓을 찾을 수 없습니다"
-"Order number","주문 번호"
+"Order Number","주문 번호"
 "Priority","우선 순위"
 "High","높음"
 "Low","낮음"
diff --git a/src/app/locale/nl_NL/Zendesk_Zendesk.csv b/src/app/locale/nl_NL/Zendesk_Zendesk.csv
index dddadb4a..e0a65293 100644
--- a/src/app/locale/nl_NL/Zendesk_Zendesk.csv
+++ b/src/app/locale/nl_NL/Zendesk_Zendesk.csv
@@ -41,7 +41,7 @@
 "Normal","Normaal"
 "On-hold","Geparkeerd"
 "Open","Open"
-"Order number","Ordernummer"
+"Order Number","Ordernummer"
 "Pending","In afwachting"
 "Priority","Prioriteit"
 "Problem","Probleem"
diff --git a/src/app/locale/no_NO/Zendesk_Zendesk.csv b/src/app/locale/no_NO/Zendesk_Zendesk.csv
index 5b9089f1..358ca84f 100644
--- a/src/app/locale/no_NO/Zendesk_Zendesk.csv
+++ b/src/app/locale/no_NO/Zendesk_Zendesk.csv
@@ -41,7 +41,7 @@
 "Normal","Normal"
 "On-hold","On-hold"
 "Open","Open"
-"Order number","Order number"
+"Order Number","Order Number"
 "Pending","Pending"
 "Priority","Priority"
 "Problem","Problem"
diff --git a/src/app/locale/pt_BR/Zendesk_Zendesk.csv b/src/app/locale/pt_BR/Zendesk_Zendesk.csv
index 034cc4bb..4d3130ea 100644
--- a/src/app/locale/pt_BR/Zendesk_Zendesk.csv
+++ b/src/app/locale/pt_BR/Zendesk_Zendesk.csv
@@ -41,7 +41,7 @@
 "Normal","Normal"
 "On-hold","Em espera"
 "Open","Aberto"
-"Order number","Número do pedido"
+"Order Number","Número do pedido"
 "Pending","Pendente"
 "Priority","Prioridade"
 "Problem","Problema"
diff --git a/src/app/locale/pt_PT/Zendesk_Zendesk.csv b/src/app/locale/pt_PT/Zendesk_Zendesk.csv
index 3cf39d5b..407c8381 100644
--- a/src/app/locale/pt_PT/Zendesk_Zendesk.csv
+++ b/src/app/locale/pt_PT/Zendesk_Zendesk.csv
@@ -41,7 +41,7 @@
 "Normal","Normal"
 "On-hold","Em espera"
 "Open","Aberto"
-"Order number","Número do pedido"
+"Order Number","Número do pedido"
 "Pending","Pendente"
 "Priority","Prioridade"
 "Problem","Problema"
diff --git a/src/app/locale/ru_RU/Zendesk_Zendesk.csv b/src/app/locale/ru_RU/Zendesk_Zendesk.csv
index bad3831f..065398b1 100644
--- a/src/app/locale/ru_RU/Zendesk_Zendesk.csv
+++ b/src/app/locale/ru_RU/Zendesk_Zendesk.csv
@@ -41,7 +41,7 @@
 "Normal","Нормальный"
 "On-hold","На удержании"
 "Open","Открыт"
-"Order number","Номер заказа"
+"Order Number","Номер заказа"
 "Pending","В ожидании"
 "Priority","Приоритет"
 "Problem","Проблема"
diff --git a/src/app/locale/sv_SV/Zendesk_Zendesk.csv b/src/app/locale/sv_SV/Zendesk_Zendesk.csv
index 9ef85812..2527e0f2 100644
--- a/src/app/locale/sv_SV/Zendesk_Zendesk.csv
+++ b/src/app/locale/sv_SV/Zendesk_Zendesk.csv
@@ -41,7 +41,7 @@
 "Normal","Normal"
 "On-hold","On-hold"
 "Open","Open"
-"Order number","Order number"
+"Order Number","Order Number"
 "Pending","Pending"
 "Priority","Priority"
 "Problem","Problem"
diff --git a/src/app/locale/tr_TR/Zendesk_Zendesk.csv b/src/app/locale/tr_TR/Zendesk_Zendesk.csv
index 3f1cdcf9..7090d2f4 100644
--- a/src/app/locale/tr_TR/Zendesk_Zendesk.csv
+++ b/src/app/locale/tr_TR/Zendesk_Zendesk.csv
@@ -41,7 +41,7 @@
 "Normal","Normal"
 "On-hold","On-hold"
 "Open","Open"
-"Order number","Order number"
+"Order Number","Order Number"
 "Pending","Pending"
 "Priority","Priority"
 "Problem","Problem"
diff --git a/src/app/locale/uk_UK/Zendesk_Zendesk.csv b/src/app/locale/uk_UK/Zendesk_Zendesk.csv
index 74e8d50e..86935a10 100644
--- a/src/app/locale/uk_UK/Zendesk_Zendesk.csv
+++ b/src/app/locale/uk_UK/Zendesk_Zendesk.csv
@@ -41,7 +41,7 @@
 "Normal","Normal"
 "On-hold","On-hold"
 "Open","Open"
-"Order number","Order number"
+"Order Number","Order Number"
 "Pending","Pending"
 "Priority","Priority"
 "Problem","Problem"
diff --git a/src/app/locale/zh_TW/Zendesk_Zendesk.csv b/src/app/locale/zh_TW/Zendesk_Zendesk.csv
index edafe221..13962ba5 100644
--- a/src/app/locale/zh_TW/Zendesk_Zendesk.csv
+++ b/src/app/locale/zh_TW/Zendesk_Zendesk.csv
@@ -41,7 +41,7 @@
 "Normal","正常"
 "On-hold","暫停"
 "Open","已開啟"
-"Order number","訂單號碼"
+"Order Number","訂單號碼"
 "Pending","未決"
 "Priority","優先等級"
 "Problem","事故"
diff --git a/src/skin/adminhtml/default/default/zendesk/zendesk.css b/src/skin/adminhtml/default/default/zendesk/zendesk.css
index d3c10fd9..53f33e87 100644
--- a/src/skin/adminhtml/default/default/zendesk/zendesk.css
+++ b/src/skin/adminhtml/default/default/zendesk/zendesk.css
@@ -45,4 +45,43 @@ h3.zendesk-header {
 button.zendesk span {
     background-image: url("button.png");
     padding-left: 16px;
-}
\ No newline at end of file
+}
+.grid tr.headings th.col-1 {
+    width: 100%;
+}
+.grid tr.headings th.col-2 {
+    width: 50%;
+}
+.grid tr.headings th.col-3 {
+    width: 33.33%;
+}
+.grid tr.headings th.col-4 {
+    width: 25%;
+}
+.grid tr.headings th.col-5 {
+    width: 20%;
+}
+.grid tr.headings th.col-6 {
+    width: 16.66%;
+}
+.grid tr.headings th.col-7 {
+    width: 14.28%;
+}
+.grid tr.headings th.col-8 {
+    width: 12.5%;
+}
+.grid tr.filter .range input {
+    min-width: 61px !important;
+}
+div.entry-edit-head .fright {
+    float: right;
+}
+#tickets_grid_tab_content tbody .zendesk-grid-tr:hover,
+#zendesk_create_customer_search_grid_table tbody tr:hover,
+#zendesk_create_order_search_grid_table tbody tr:hover, 
+#zendesk_tab_tickets_grid_all_table .zendesk-grid-tr:hover {
+    background: #fcf5dd;
+}
+#zendesk_create_order_search_grid_table tr.filter .range .range-line {
+    min-width: 124px;
+}