diff --git a/libraries/joomla/language/text.php b/libraries/joomla/language/text.php
index 91a3fc8b..5c1f9bea 100644
--- a/libraries/joomla/language/text.php
+++ b/libraries/joomla/language/text.php
@@ -111,9 +111,9 @@ public static function alt($string, $alt, $jsSafe = false, $interpretBackSlashes
      * script is a boolean to indicate that the string will be push in the javascript language store.
      *
      * Examples:
-     * <script>alert(Joomla.JText._('<?php echo JText::plural("COM_PLUGINS_N_ITEMS_UNPUBLISHED", 1, array("script"=>true));?>'));</script>
+     * <script>alert(Joomla.JText._('<?php echo TextHelper::plural("COM_PLUGINS_N_ITEMS_UNPUBLISHED", 1, array("script"=>true));?>'));</script>
      * will generate an alert message containing '1 plugin successfully disabled'
-     * <?php echo JText::plural("COM_PLUGINS_N_ITEMS_UNPUBLISHED", 1);?> it will generate a '1 plugin successfully disabled' string
+     * <?php echo TextHelper::plural("COM_PLUGINS_N_ITEMS_UNPUBLISHED", 1);?> it will generate a '1 plugin successfully disabled' string
      *
      * @param string  $string The format string.
      * @param integer $n      The number of items
diff --git a/src/Cobalt/Controller/Graph.php b/src/Cobalt/Controller/Graph.php
index abf570e9..16babc60 100644
--- a/src/Cobalt/Controller/Graph.php
+++ b/src/Cobalt/Controller/Graph.php
@@ -22,11 +22,11 @@ public function execute()
         //get graph data from model
         $model = new GraphsModel;
 
-        $type = $this->getInput()->get('filter');
+        $type = $this->getInput()->getCmd('filter');
         if ($type == 'company') {
             $graph_data = $model->getGraphData('company');
         } else {
-            $graph_data = $model->getGraphData($type,$this->getInput()->get('id'));
+            $graph_data = $model->getGraphData($type,$this->getInput()->getInt('id'));
         }
 
         //return data
diff --git a/src/Cobalt/Controller/SaveCf.php b/src/Cobalt/Controller/SaveCf.php
index 40b2a0cc..f3ba499c 100644
--- a/src/Cobalt/Controller/SaveCf.php
+++ b/src/Cobalt/Controller/SaveCf.php
@@ -13,6 +13,7 @@
 use Cobalt\Helper\DateHelper;
 use Cobalt\Model\Deal as DealModel;
 use Cobalt\Model\People as PeopleModel;
+use Cobalt\Helper\TextHelper;
 
 // no direct access
 defined( '_CEXEC' ) or die( 'Restricted access' );
@@ -79,7 +80,7 @@ public function execute()
                     $model = new PeopleModel;
                     $return = $model->getPerson($data['person_id']);
                     $response->alert = new \stdClass;
-                    $response->alert->message = \JText::_('DEAL_CONTACT_ADDED_SUCCESS');
+                    $response->alert->message = TextHelper::_('DEAL_CONTACT_ADDED_SUCCESS');
                     $response->alert->type = 'success';
                     $response->item = $return;
                     $response->reload = 2000;
@@ -96,7 +97,7 @@ public function execute()
             }
         } else {
             $response->alert = new \stdClass;
-            $response->alert->message = \JText::_('DEAL_CONTACT_ERROR_FAILURE_ADD_PERSON');
+            $response->alert->message = TextHelper::_('DEAL_CONTACT_ERROR_FAILURE_ADD_PERSON');
             $response->alert->type = 'error';
         }
 
diff --git a/src/Cobalt/Helper/LinkHelper.php b/src/Cobalt/Helper/LinkHelper.php
new file mode 100644
index 00000000..3250e62f
--- /dev/null
+++ b/src/Cobalt/Helper/LinkHelper.php
@@ -0,0 +1,199 @@
+<?php
+
+/*------------------------------------------------------------------------
+# Cobalt
+# ------------------------------------------------------------------------
+# @author Cobalt
+# @copyright Copyright (C) 2012 cobaltcrm.org All Rights Reserved.
+# @license - http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
+# Website: http://www.cobaltcrm.org
+-------------------------------------------------------------------------*/
+
+namespace Cobalt\Helper;
+
+// no direct access
+defined( '_CEXEC' ) or die( 'Restricted access' );
+
+use Cobalt\Helper\RouteHelper;
+
+/**
+ * Class to build link to specific items
+ *
+ * Class LinkHelper
+ * @package Cobalt\Helper
+ */
+class LinkHelper
+{
+    /**
+     * @param array $params
+     * @return string
+     */
+    public static function viewDashboard(array $params = array())
+    {
+        $link = array(
+            'view' => 'dashboard'
+        );
+
+        $query = array_merge($link, $params);
+
+        return self::create($query);
+    }
+
+    /**
+     * @param array $params
+     * @return string
+     */
+    public static function viewDocuments(array $params = array())
+    {
+        $link = array(
+            'view' => 'documents'
+        );
+
+        $query = array_merge($link, $params);
+
+        return self::create($query);
+    }
+
+    /**
+     * @param array $params
+     * @return string
+     */
+    public static function viewAdminDocuments(array $params = array())
+    {
+        $link = array(
+            'view' => 'admindocuments'
+        );
+
+        $query = array_merge($link, $params);
+
+        return self::create($query);
+    }
+
+    /**
+     * @param array $params
+     * @return string
+     */
+    public static function viewImport(array $params = array())
+    {
+        $link = array(
+            'view' => 'import'
+        );
+
+        $query = array_merge($link, $params);
+
+        return self::create($query);
+    }
+
+    /**
+     * @param array $params
+     * @return string
+     */
+    public static function upload(array $params = array())
+    {
+        $link = array(
+            'task' => 'upload'
+        );
+
+        $query = array_merge($link, $params);
+
+        return self::create($query);
+    }
+
+    /**
+     * Link to view deal
+     *
+     * @param $deal_id
+     * @return string
+     */
+    public static function viewDeal($deal_id, array $params = array())
+    {
+        $link = array(
+            'view' => 'deal',
+            'layout' => 'deal',
+            'id' => intval($deal_id)
+        );
+
+        $query = array_merge($link, $params);
+
+        return self::create($query);
+    }
+
+    /**
+     * @param array $params
+     * @return string
+     */
+    public static function viewDeals(array $params = array())
+    {
+        $link = array(
+            'view' => 'deals'
+        );
+
+        $query = array_merge($link, $params);
+
+        return self::create($query);
+    }
+
+    /**
+     * @param array $params
+     * @return string
+     */
+    public static function viewReports(array $params = array())
+    {
+        $link = array(
+            'view' => 'reports'
+        );
+
+        $query = array_merge($link, $params);
+
+        return self::create($query);
+    }
+
+    /**
+     * Link to view person
+     *
+     * @param $person_id
+     * @return string
+     */
+    public static function viewPerson($person_id, array $params = array())
+    {
+        $link = array(
+            'view' => 'people',
+            'layout' => 'person',
+            'id' => intval($person_id)
+        );
+
+        $query = array_merge($link, $params);
+
+        return self::create($query);
+    }
+
+    /**
+     * Link to view Company
+     *
+     * @param $copmany_id
+     * @return string
+     */
+    public static function viewCompany($copmany_id, array $params = array())
+    {
+        $link = array(
+            'view' => 'companies',
+            'layout' => 'company',
+            'id' => intval($copmany_id)
+        );
+
+        $query = array_merge($link, $params);
+
+        return self::create($query);
+    }
+
+    /**
+     * Build Custom URL by array of keys and values
+     *
+     * @param array $query
+     * @return string
+     */
+    public static function create(array $query)
+    {
+        return RouteHelper::_('index.php?'.http_build_query($query));
+    }
+}
\ No newline at end of file
diff --git a/src/Cobalt/Model/Commission.php b/src/Cobalt/Model/Commission.php
index 81387cb2..816f5630 100644
--- a/src/Cobalt/Model/Commission.php
+++ b/src/Cobalt/Model/Commission.php
@@ -13,6 +13,7 @@
 use Cobalt\Helper\UsersHelper;
 use Cobalt\Helper\DateHelper;
 use Cobalt\Helper\DealHelper;
+use Cobalt\Helper\TextHelper;
 
 // no direct access
 defined( '_CEXEC' ) or die( 'Restricted access' );
@@ -58,9 +59,9 @@ public function getMonthlyCommission($access_type=null,$access_id=null)
             foreach ($members as $key=>$member) {
                 foreach ($member as $date_key => $data) {
                     if ( array_key_exists($date_key,$results) ) {
-                        $results[$date_key]['y'] += $data['y'];
+                        $results[$date_key] += $data;
                     } else {
-                        $results[$date_key]['y'] = $data['y'];
+                        $results[$date_key] = $data;
                     }
                 }
             }
@@ -84,7 +85,9 @@ public function getYearlyCommission($access_type=null,$access_id=null)
 
             //array to assign our data
             $members = array();
-            $results = array();
+            $data           = new \stdClass;
+            $data->labels   = array();
+            $data->datasets = array();
 
             //get team data
             if ($access_type == 'team') {
@@ -105,17 +108,25 @@ public function getYearlyCommission($access_type=null,$access_id=null)
             }
 
             //combine data
-            foreach ($members as $key=>$member) {
-                foreach ($member as $date_key=>$data) {
-                    if ( array_key_exists($date_key,$results) ) {
-                        $results[$date_key]['y'] += $data['y'];
-                    } else {
-                        $results[$date_key]['y'] = $data['y'];
+            $results = array();
+            foreach ($members as $member) {
+                foreach ($member->datasets[0]->data as $key => $value) {
+                    if (!isset($results[$key])) {
+                        $results[$key] = 0;
                     }
+                    $results[$key] += $value;
                 }
             }
 
-            return $results;
+            $data->datasets[0]                   = new \stdClass;
+            $data->datasets[0]->data             = $results;
+            $data->datasets[0]->label            = '';
+            $data->datasets[0]->fillColor        = "rgba(151,187,205,0.5)";
+            $data->datasets[0]->strokeColor      = "rgba(151,187,205,0.8)";
+            $data->datasets[0]->pointColor       = "rgba(151,187,205,0.75)";
+            $data->datasets[0]->pointStrokeColor = "rgba(151,187,205,1)";
+
+            return $data;
         }
 
     }
@@ -136,11 +147,17 @@ public function getMonthlyCommissionData($id)
         //get stage id to filter deals by
         $won_stage_ids = DealHelper::getWonStages();
 
+        $data           = new \stdClass;
+        $data->labels   = array();
+        $data->datasets = array();
+
         //gen query
         $results = array();
         foreach ($weeks as $week) {
             $start_date = $week['start_date'];
             $end_date = $week['end_date'];
+            $weekDate       = new \DateTime($start_date);
+            $data->labels[] = TextHelper::_('COBALT_WEEK') . ' ' . $weekDate->format('W');
 
             //flush query
             $query = $this->db->getQuery(true)
@@ -160,10 +177,18 @@ public function getMonthlyCommissionData($id)
         //clean data for commission rate
         foreach ($results as $key => $result) {
             $commission_rate = UsersHelper::getCommissionRate($result['owner_id']);
-            $results[$key]['y'] = (int) $result['y']*($commission_rate/100);
+            $results[$key] = (int) $result['y']*($commission_rate/100);
         }
 
-        return $results;
+        $data->datasets[0]                   = new \stdClass;
+        $data->datasets[0]->data             = $results;
+        $data->datasets[0]->label            = '';
+        $data->datasets[0]->fillColor        = "rgba(151,187,205,0.5)";
+        $data->datasets[0]->strokeColor      = "rgba(151,187,205,0.8)";
+        $data->datasets[0]->pointColor       = "rgba(151,187,205,0.75)";
+        $data->datasets[0]->pointStrokeColor = "rgba(151,187,205,1)";
+
+        return $data;
     }
 
     /**
@@ -178,6 +203,10 @@ public function getYearlyCommissionData($id)
         $month_names = DateHelper::getMonthNames();
         $months = DateHelper::getMonthDates();
 
+        $data           = new \stdClass;
+        $data->labels   = array();
+        $data->datasets = array();
+
         //get stage id to filter deals by
         $won_stage_ids = DealHelper::getWonStages();
 
@@ -186,6 +215,8 @@ public function getYearlyCommissionData($id)
         foreach ($months as $month) {
             $start_date = $month['date'];
             $end_date = DateHelper::formatDBDate(date('Y-m-d 00:00:00',strtotime("$start_date + 1 months")));
+            $weekDate       = new \DateTime($start_date);
+            $data->labels[] = TextHelper::_('COBALT_MONTH') . ' ' . $weekDate->format('m');
 
             //flush the query
             $query = $this->db->getQuery(true)
@@ -205,10 +236,18 @@ public function getYearlyCommissionData($id)
         //clean data for commission rate
         foreach ($results as $key=>$result) {
             $commission_rate = UsersHelper::getCommissionRate($result['owner_id']);
-            $results[$key]['y'] = (int) $result['y']*($commission_rate/100);
+            $results[$key] = (int) $result['y']*($commission_rate/100);
         }
 
-        return $results;
+        $data->datasets[0]                   = new \stdClass;
+        $data->datasets[0]->data             = $results;
+        $data->datasets[0]->label            = '';
+        $data->datasets[0]->fillColor        = "rgba(151,187,205,0.5)";
+        $data->datasets[0]->strokeColor      = "rgba(151,187,205,0.8)";
+        $data->datasets[0]->pointColor       = "rgba(151,187,205,0.75)";
+        $data->datasets[0]->pointStrokeColor = "rgba(151,187,205,1)";
+
+        return $data;
     }
 
 }
diff --git a/src/Cobalt/Model/Deal.php b/src/Cobalt/Model/Deal.php
index f014fae7..4e209592 100644
--- a/src/Cobalt/Model/Deal.php
+++ b/src/Cobalt/Model/Deal.php
@@ -10,6 +10,7 @@
 
 namespace Cobalt\Model;
 
+use Cobalt\Helper\LinkHelper;
 use Joomla\Database\DatabaseDriver;
 use Joomla\Registry\Registry;
 use Joomla\Filter\OutputFilter;
@@ -1526,10 +1527,10 @@ public function getDataTableFieldTemplate($column, $item)
                 $template = '<input type="checkbox" class="export" name="ids[]" value="'.$item->id.'" />';
                 break;
             case 'name':
-                $template = '<a href="'.RouteHelper::_('index.php?view=deals&layout=deal&id='.$item->id).'">'.$item->name.'</a>';
+                $template = '<a href="'. LinkHelper::viewDeal($item->id).'">'.$item->name.'</a>';
                 break;
             case 'company_name':
-                $template = '<a href="'.RouteHelper::_('index.php?view=companies&layout=company&id='.$item->company_id).'">'.$item->company_name.'</a>';
+                $template = '<a href="'.LinkHelper::viewCompany($item->company_id).'">'.$item->company_name.'</a>';
                 break;
             case 'amount':
                 $template = ConfigHelper::getCurrency().$item->amount;
@@ -1647,7 +1648,7 @@ public function getDataTableFieldTemplate($column, $item)
                 $template .= '</div>';
                 $template .= '<div class="extras-'.$item->id.' hide">';
                 $template .= ' <b>'.TextHelper::_('COBALT_PRIMARY_CONTACT').'</b>';
-                $template .= ' <a href="'.RouteHelper::_('index.php?view=people&layout=person&id='.$item->primary_contact_id).'">'.$item->primary_contact_first_name.'</a><br>';
+                $template .= ' <a href="'.LinkHelper::viewPerson($item->primary_contact_id).'">'.$item->primary_contact_first_name.'</a><br>';
                 $template .= ' <b>'.TextHelper::_('COBALT_NEXT_ACTION').'</b><br>';
                 $template .= '</div>';
                 break;
diff --git a/src/Cobalt/Model/Document.php b/src/Cobalt/Model/Document.php
index 34ea1779..4eafe4be 100644
--- a/src/Cobalt/Model/Document.php
+++ b/src/Cobalt/Model/Document.php
@@ -17,7 +17,6 @@
 use Cobalt\Helper\DateHelper;
 use Cobalt\Helper\UsersHelper;
 use Cobalt\Helper\FileHelper;
-use JUri;
 use Cobalt\Helper\RouteHelper;
 
 // no direct access
diff --git a/src/Cobalt/Model/Documents.php b/src/Cobalt/Model/Documents.php
index ca3cf377..bf996a7f 100644
--- a/src/Cobalt/Model/Documents.php
+++ b/src/Cobalt/Model/Documents.php
@@ -17,7 +17,6 @@
 use Cobalt\Helper\DateHelper;
 use Joomla\Filesystem\File;
 use Joomla\Registry\Registry;
-use JUri;
 
 // no direct access
 defined( '_CEXEC' ) or die( 'Restricted access' );
diff --git a/src/Cobalt/Model/Install.php b/src/Cobalt/Model/Install.php
index ac633d1d..8c39f36c 100644
--- a/src/Cobalt/Model/Install.php
+++ b/src/Cobalt/Model/Install.php
@@ -450,7 +450,7 @@ public function __createDatabase($db, $options, $utf = true)
     {
         if (is_null($options))
         {
-            throw new RuntimeException('$options object must not be null.');
+            throw new \RuntimeException('$options object must not be null.');
         }
         elseif (empty($options->db_name))
         {
diff --git a/src/Cobalt/Model/Revenue.php b/src/Cobalt/Model/Revenue.php
index fcd68aaf..736eec61 100644
--- a/src/Cobalt/Model/Revenue.php
+++ b/src/Cobalt/Model/Revenue.php
@@ -130,12 +130,16 @@ public function getYearlyRevenue($access_type = null, $access_id = null)
 		// Get stage id to filter deals by
 		$won_stage_ids = DealHelper::getWonStages();
 
-		$results = array();
+        $data           = new \stdClass;
+        $data->labels   = array();
+        $data->datasets = array();
 
 		foreach ($months as $month)
 		{
 			$start_date = $month['date'];
 			$end_date   = DateHelper::formatDBDate(date('Y-m-d 00:00:00', strtotime($start_date . ' + 1 months')));
+            $weekDate       = new \DateTime($start_date);
+            $data->labels[] = TextHelper::_('COBALT_MONTH') . ' ' . $weekDate->format('m');
 
 			$query->clear()
 				->select('d.modified, SUM(d.amount) AS y')
@@ -173,9 +177,17 @@ public function getYearlyRevenue($access_type = null, $access_id = null)
 			}
 
 			$totals['y'] = (int) $totals['y'];
-			$results[]   = $totals;
+			$results[]   = $totals['y'];
 		}
 
-		return $results;
+        $data->datasets[0]                   = new \stdClass;
+        $data->datasets[0]->data             = $results;
+        $data->datasets[0]->label            = '';
+        $data->datasets[0]->fillColor        = "rgba(151,187,205,0.5)";
+        $data->datasets[0]->strokeColor      = "rgba(151,187,205,0.8)";
+        $data->datasets[0]->pointColor       = "rgba(151,187,205,0.75)";
+        $data->datasets[0]->pointStrokeColor = "rgba(151,187,205,1)";
+
+		return $data;
 	}
 }
diff --git a/src/Cobalt/View/Admindocuments/Html.php b/src/Cobalt/View/Admindocuments/Html.php
index 1f7943ec..f77efd23 100644
--- a/src/Cobalt/View/Admindocuments/Html.php
+++ b/src/Cobalt/View/Admindocuments/Html.php
@@ -63,7 +63,7 @@ public function render()
         else
         {
             //buttons
-            $this->toolbar->add(array('view' => 'documents', 'layout' => 'edit', 'format' => 'raw', 'tmpl' => 'component', 'return' => base64_encode(\JUri::current())), 'COBALT_TOOLBAR_NEW', 'btn btn-primary', 'plus', array('data-toggle'=> 'modal', 'data-target'=> '#uploadModal'));
+            $this->toolbar->add(array('view' => 'documents', 'layout' => 'edit', 'format' => 'raw', 'tmpl' => 'component', 'return' => base64_encode($app->get('uri')->current())), 'COBALT_TOOLBAR_NEW', 'btn btn-primary', 'plus', array('data-toggle'=> 'modal', 'data-target'=> '#uploadModal'));
             // ToolbarHelper::editList('edit');
             $this->toolbar->addDeleteRow();
 
diff --git a/src/Cobalt/View/Admindocuments/tmpl/default.php b/src/Cobalt/View/Admindocuments/tmpl/default.php
index ec03ab9a..f91436f7 100644
--- a/src/Cobalt/View/Admindocuments/tmpl/default.php
+++ b/src/Cobalt/View/Admindocuments/tmpl/default.php
@@ -18,15 +18,15 @@
                 <div class="col-md-9">
                     <div class="page-header">
                         <?php echo $this->toolbar->render(); ?>
-                        <h3><?php echo JText::_('COBALT_SHARED_DOCUMENTS'); ?></h3>
+                        <h3><?php echo TextHelper::_('COBALT_SHARED_DOCUMENTS'); ?></h3>
                     </div>
                     
-                    <div class="alert alert-info"><?php echo JText::_('COBALT_SHARED_DOCS_DESC'); ?></div>
+                    <div class="alert alert-info"><?php echo TextHelper::_('COBALT_SHARED_DOCS_DESC'); ?></div>
                     <table class="table table-striped data-table">
                         <thead>
                             <tr>
                                 <th width="1%">
-                                    <input type="checkbox" name="checkall-toggle" value="" title="<?php echo JText::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Cobalt.selectAll(this)" />
+                                    <input type="checkbox" name="checkall-toggle" value="" title="<?php echo TextHelper::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Cobalt.selectAll(this)" />
                                 </th>
                                 <th>
                                     <?php echo TextHelper::_('COBALT_HEADER_DOCUMENT_TYPE'); ?>
diff --git a/src/Cobalt/View/Admindocuments/tmpl/edit.php b/src/Cobalt/View/Admindocuments/tmpl/edit.php
index 5f6674ee..08cb0f51 100644
--- a/src/Cobalt/View/Admindocuments/tmpl/edit.php
+++ b/src/Cobalt/View/Admindocuments/tmpl/edit.php
@@ -16,10 +16,10 @@
             <div id="system-message-container"></div>
             <div class="row-fluid">
                 <h3><?php echo $this->header; ?></h3>
-                <form action="index.php?view=documents" method="post" name="adminForm" id="adminForm" class="form-validate" >
+                <form action="<?php echo LinkHelper::viewDocuments(); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" >
                     <table>
                         <tr>
-                            <td><b><?php echo JText::_('COBALT_NAME'); ?></b></td>
+                            <td><b><?php echo TextHelper::_('COBALT_NAME'); ?></b></td>
                             <td><input type="text" class="form-control" name="filename" value="<?php echo $this->document['filename']; ?>" /></td>
                         </tr>
                     </table>
@@ -28,7 +28,7 @@
                             <input type="hidden" name="id" value="<?php echo $this->document['id']; ?>" />
                         <?php } ?>
                         <input type="hidden" name="task" value="" />
-                        <?php echo JHtml::_('form.token'); ?>
+
                     </div>
                 </form>
             </div>
diff --git a/src/Cobalt/View/Admindocuments/tmpl/upload.php b/src/Cobalt/View/Admindocuments/tmpl/upload.php
index 5584b8f2..3bf1e5d5 100644
--- a/src/Cobalt/View/Admindocuments/tmpl/upload.php
+++ b/src/Cobalt/View/Admindocuments/tmpl/upload.php
@@ -10,7 +10,7 @@
 // no direct access
 defined( '_CEXEC' ) or die( 'Restricted access' );
 ?>
-<form id="upload_form" action="<?php echo RouteHelper::_('index.php?task=upload'); ?>" method="post" enctype="multipart/form-data">
+<form id="upload_form" action="<?php echo LinkHelper::upload(); ?>" method="post" enctype="multipart/form-data">
 
 
     <div class="btn-group">
@@ -23,5 +23,5 @@
 
     <input type="hidden" name="association_id" value="<?php echo $company['id']; ?>" />
     <input type="hidden" name="association_type" value="company">
-    <input type="hidden" name="return" value="<?php echo base64_encode(JUri::current()); ?>" />
+    <input type="hidden" name="return" value="<?php echo base64_encode(Factory::getApplication()->get('uri')->current()); ?>" />
 </form>
\ No newline at end of file
diff --git a/src/Cobalt/View/Admindocuments/tmpl/upload_success.php b/src/Cobalt/View/Admindocuments/tmpl/upload_success.php
index ea2c6d52..0c213de4 100644
--- a/src/Cobalt/View/Admindocuments/tmpl/upload_success.php
+++ b/src/Cobalt/View/Admindocuments/tmpl/upload_success.php
@@ -10,6 +10,6 @@
 // no direct access
 defined( '_CEXEC' ) or die( 'Restricted access' ); ?>
 <script type="text/javascript">
-       setTimeout(function(){window.top.location = 'index.php?view=admindocuments';},1000);
+       setTimeout(function(){window.top.location = '<?php echo LinkHelper::viewAdminDocuments(); ?>';},1000);
 </script>
 <?php echo TextHelper::_('COBALT_UPLOAD_SUCCESS');
diff --git a/src/Cobalt/View/Adminimport/tmpl/default.php b/src/Cobalt/View/Adminimport/tmpl/default.php
index d34552c2..d679fa56 100644
--- a/src/Cobalt/View/Adminimport/tmpl/default.php
+++ b/src/Cobalt/View/Adminimport/tmpl/default.php
@@ -19,45 +19,45 @@
                 <?php echo $this->menu['menu']->render(); ?>
                 <div class="col-md-9">
                     <ul class="nav nav-tabs" id="myTab">
-                        <li class="active"><a data-toggle="tab" href="#import_begin"><?php echo JText::_('COBALT_IMPORT_BEGIN'); ?></a></li>
-                        <li><a data-toggle="tab" href="#import_review"><?php echo JText::_('COBALT_IMPORT_REVIEW'); ?></a></li>
-                        <li><a data-toggle="tab" href="#import_sample_tab"><?php echo JText::_('COBALT_IMPORT_SAMPLE_DATA'); ?></a></li>
+                        <li class="active"><a data-toggle="tab" href="#import_begin"><?php echo TextHelper::_('COBALT_IMPORT_BEGIN'); ?></a></li>
+                        <li><a data-toggle="tab" href="#import_review"><?php echo TextHelper::_('COBALT_IMPORT_REVIEW'); ?></a></li>
+                        <li><a data-toggle="tab" href="#import_sample_tab"><?php echo TextHelper::_('COBALT_IMPORT_SAMPLE_DATA'); ?></a></li>
                     </ul>
                     <div class="tab-content">
                         <div class="tab-pane active" id="import_begin">
                             <div class="step">
                                 <div class="title">
-                                    <h3><?php echo JText::_('COBALT_STEP_ONE'); ?></h3>
+                                    <h3><?php echo TextHelper::_('COBALT_STEP_ONE'); ?></h3>
                                 </div>
                                 <div class="text">
                                     <ul>
-                                        <li><?php echo JText::_('COBALT_EXPORT_YOUR_FILE_INSTRUCTIONS'); ?></li>
+                                        <li><?php echo TextHelper::_('COBALT_EXPORT_YOUR_FILE_INSTRUCTIONS'); ?></li>
                                     </ul>
                                 </div>
                             </div>
                             <div class="step">
                                 <div class="title">
-                                    <h3><?php echo JText::_('COBALT_STEP_TWO'); ?></h3>
+                                    <h3><?php echo TextHelper::_('COBALT_STEP_TWO'); ?></h3>
                                 </div>
                                 <div class="text">
                                     <ul>
-                                        <li><?php echo JText::_('COBALT_ENSURE_YOUR_FILE_IS_FORMATTED'); ?></li>
-                                        <li><?php echo JText::_('COBALT_ENSURE_YOUR_FILE_IS_FORMATTED_INSTRUCTIONS'); ?></li>
+                                        <li><?php echo TextHelper::_('COBALT_ENSURE_YOUR_FILE_IS_FORMATTED'); ?></li>
+                                        <li><?php echo TextHelper::_('COBALT_ENSURE_YOUR_FILE_IS_FORMATTED_INSTRUCTIONS'); ?></li>
                                         <li>
                                             <form class="inline-form" method="post">
-                                                <input class="btn" onclick="downloadImportTemplate(this)" type="button" value="<?php echo JText::_('COBALT_DOWNLOAD_COMPANIES_TEMPLATE'); ?>" />
+                                                <input class="btn" onclick="downloadImportTemplate(this)" type="button" value="<?php echo TextHelper::_('COBALT_DOWNLOAD_COMPANIES_TEMPLATE'); ?>" />
                                                 <input type="hidden" name="template_type" value="companies" />
                                             </form>
                                         </li>
                                         <li>
                                             <form class="inline-form" method="post">
-                                                <input class="btn" onclick="downloadImportTemplate(this)" type="button" value="<?php echo JText::_('COBALT_DOWNLOAD_DEALS_TEMPLATE'); ?>" />
+                                                <input class="btn" onclick="downloadImportTemplate(this)" type="button" value="<?php echo TextHelper::_('COBALT_DOWNLOAD_DEALS_TEMPLATE'); ?>" />
                                                 <input type="hidden" name="template_type" value="deals" />
                                             </form>
                                         </li>
                                         <li>
                                             <form class="inline-form" method="post">
-                                                <input class="btn" onclick="downloadImportTemplate(this)" type="button" value="<?php echo JText::_('COBALT_DOWNLOAD_PEOPLE_TEMPLATE'); ?>" />
+                                                <input class="btn" onclick="downloadImportTemplate(this)" type="button" value="<?php echo TextHelper::_('COBALT_DOWNLOAD_PEOPLE_TEMPLATE'); ?>" />
                                                 <input type="hidden" name="template_type" value="people" />
                                             </form>
                                         </li>
@@ -66,21 +66,21 @@
                             </div>
                             <div class="step">
                                 <div class="title">
-                                    <h3><?php echo JText::_('COBALT_STEP_THREE'); ?></h3>
+                                    <h3><?php echo TextHelper::_('COBALT_STEP_THREE'); ?></h3>
                                 </div>
                                 <div class="text">
                                     <ul>
-                                        <li><?php echo JText::_('COBALT_UPLOAD_YOUR_FILE'); ?></li>
-                                        <li><?php echo JText::_('COBALT_SELECT_YOUR_CSV'); ?>
+                                        <li><?php echo TextHelper::_('COBALT_UPLOAD_YOUR_FILE'); ?></li>
+                                        <li><?php echo TextHelper::_('COBALT_SELECT_YOUR_CSV'); ?>
                                             <form id="import_form" action="index.php?view=import" method="post" enctype="multipart/form-data">
                                                 <div class="input_upload_button" >
-                                                    <label><?php echo JText::_('COBALT_TYPE'); ?></label>
+                                                    <label><?php echo TextHelper::_('COBALT_TYPE'); ?></label>
                                                     <?php echo DropdownHelper::showImportTypes(); ?>
                                                     <input type="hidden" name="type" value="people" />
-                                                    <label><?php echo JText::_('COBALT_FILE'); ?></label>
+                                                    <label><?php echo TextHelper::_('COBALT_FILE'); ?></label>
                                                     <input class="input-file" type="file" name="document" />
                                                     <label></label>
-                                                    <input class="btn btn-primary" type="submit" value="<?php echo JText::_('COBALT_IMPORT_DATA'); ?>" />
+                                                    <input class="btn btn-primary" type="submit" value="<?php echo TextHelper::_('COBALT_IMPORT_DATA'); ?>" />
                                                 </div>
                                             </form>
                                         </li>
@@ -91,21 +91,21 @@
                          <div class="tab-pane" id="import_review" >
                              <div id="import_review_container">
                                  <?php if ($this->import_post==TRUE) { ?>
-                                    <h1><?php echo JText::_('COBALT_REVIEW_YOUR_IMPORT'); ?></h1>
+                                    <h1><?php echo TextHelper::_('COBALT_REVIEW_YOUR_IMPORT'); ?></h1>
                                 <?php if ( isset($this->import_data) && count($this->import_data) > 0 ) { ?>
-                                    <p><?php echo JText::_('COBALT_REVIEW_IMPORT_MESSAGE'); ?></p>
+                                    <p><?php echo TextHelper::_('COBALT_REVIEW_IMPORT_MESSAGE'); ?></p>
                                 <?php } else { ?>
-                                    <p><div class="alert alert-error"><?php echo JText::_('COBALT_REVIEW_IMPORT_MESSAGE_ERROR'); ?></div></p>
+                                    <p><div class="alert alert-error"><?php echo TextHelper::_('COBALT_REVIEW_IMPORT_MESSAGE_ERROR'); ?></div></p>
                                 <?php } ?>
                                 <?php if ( isset($this->import_data) && count($this->import_data) > 1 ) { ?>
                                     <div id="import_seek">
                                         <span>
-                                            <?php echo JText::_('COBALT_VIEWING_ENTRY'); ?>
+                                            <?php echo TextHelper::_('COBALT_VIEWING_ENTRY'); ?>
                                             <span id="viewing_entry">1</span>
-                                            <?php echo JText::_('COBALT_OF'); ?>
+                                            <?php echo TextHelper::_('COBALT_OF'); ?>
                                             <?php echo ' '.count($this->import_data); ?>
-                                            <a href="javascript:void(0)" onclick="seekImport(-1);"><?php echo JText::_('COBALT_PREVIOUS'); ?></a> -
-                                            <a href="javascript:void(0)" onclick="seekImport(1);"><?php echo JText::_('COBALT_NEXT'); ?></a>
+                                            <a href="javascript:void(0)" onclick="seekImport(-1);"><?php echo TextHelper::_('COBALT_PREVIOUS'); ?></a> -
+                                            <a href="javascript:void(0)" onclick="seekImport(1);"><?php echo TextHelper::_('COBALT_NEXT'); ?></a>
                                         </span>
                                     </div>
                                 <?php } ?>
@@ -126,7 +126,7 @@
                                                                 <input type="hidden" name="import_id[<?php echo $key; ?>][<?php echo $field; ?>]" value="<?php echo $value['value']; ?>" >
                                                                 <input type="text" class="form-control" name="import_id[<?php echo $key; ?>][<?php echo str_replace('id','name',$field); ?>]" value="<?php echo $value['label']; ?>" /></div>
                                                     <?php } else { ?>
-                                                        <div class="cobaltValue wide"><?php echo JText::_('COBALT_NO_RESULTS_FOUND'); ?></div>
+                                                        <div class="cobaltValue wide"><?php echo TextHelper::_('COBALT_NO_RESULTS_FOUND'); ?></div>
                                                     <?php } ?>
                                                 <?php } else { ?>
                                                     <div class="cobaltValue wide"><input class="form-control" type="text" name="import_id[<?php echo $key; ?>][<?php echo $field; ?>]" value="<?php echo $value; ?>" /></div>
@@ -136,7 +136,7 @@
                                         </div>
                                         <?php }  ?>
                                         <div class="import_buttons">
-                                            <input class="btn btn-primary" type="submit" value="<?php echo JText::_('COBALT_IMPORT'); ?>" /><a class="btn" onclick="window.location.href='index.php?view=import'"><?php echo JText::_('COBALT_CANCEL'); ?></a>
+                                            <input class="btn btn-primary" type="submit" value="<?php echo TextHelper::_('COBALT_IMPORT'); ?>" /><a class="btn" onclick="window.location.href='index.php?view=import'"><?php echo TextHelper::_('COBALT_CANCEL'); ?></a>
                                         </div>
                                         <?php } ?>
                                         </div>
@@ -144,32 +144,32 @@
                                 </form>
                                 <?php } else { ?>
                                     <p>
-                                        <div class="alert alert-warning"><strong><?php echo JText::_('COBALT_NO_DATA_IMPORTED'); ?></strong></div>
+                                        <div class="alert alert-warning"><strong><?php echo TextHelper::_('COBALT_NO_DATA_IMPORTED'); ?></strong></div>
                                     </p>
                                 <?php } ?>
                             </div>
                         </div>
                         <div class="tab-pane" id="import_sample_tab">
                             <div class="sample_text">
-                                <h3><?php echo JText::_('COBALT_INSTALL_SAMPLE_DATA_TITLE'); ?></h3>
-                                <p><div class="alert alert-info"><?php echo JText::_('COBALT_INSTALL_SAMPLE_DATA_DESC'); ?></div></p>
+                                <h3><?php echo TextHelper::_('COBALT_INSTALL_SAMPLE_DATA_TITLE'); ?></h3>
+                                <p><div class="alert alert-info"><?php echo TextHelper::_('COBALT_INSTALL_SAMPLE_DATA_DESC'); ?></div></p>
                                 <form action="<?php echo RouteHelper::_('index.php?view=import'); ?>" method="post" name="adminForm" id="adminForm" class="inline-form"  >
-                                    <input type="submit" value="<?php echo JText::_('COBALT_INSTALL_SAMPLE_BUTTON'); ?>" class="btn btn-primary" />
+                                    <input type="submit" value="<?php echo TextHelper::_('COBALT_INSTALL_SAMPLE_BUTTON'); ?>" class="btn btn-primary" />
                                     <input type="hidden" name="id" value="1" />
                                     <input type="hidden" name="task" value="installSampleData" />
                                     <input type="hidden" name="controller" value="import" />
                                     <input type="hidden" name="layout" value="default" />
                                     <input type="hidden" name="view" value="import" />
-                                    <?php echo JHtml::_('form.token'); ?>
+
                                 </form>
                                 <form action="<?php echo RouteHelper::_('index.php?view=import'); ?>" method="post" name="adminForm" id="adminForm" class="inline-form"  >
-                                    <input type="submit" value="<?php echo JText::_('COBALT_REMOVE_SAMPLE_BUTTON'); ?>" class="btn btn-danger" />
+                                    <input type="submit" value="<?php echo TextHelper::_('COBALT_REMOVE_SAMPLE_BUTTON'); ?>" class="btn btn-danger" />
                                     <input type="hidden" name="id" value="1" />
                                     <input type="hidden" name="task" value="removeSampleData" />
                                     <input type="hidden" name="controller" value="import" />
                                     <input type="hidden" name="layout" value="default" />
                                     <input type="hidden" name="view" value="import" />
-                                    <?php echo JHtml::_('form.token'); ?>
+
                                 </form>
                             </div>
                             </div>
diff --git a/src/Cobalt/View/Adminimport/tmpl/sample.php b/src/Cobalt/View/Adminimport/tmpl/sample.php
index d56bbd49..a2d8f115 100644
--- a/src/Cobalt/View/Adminimport/tmpl/sample.php
+++ b/src/Cobalt/View/Adminimport/tmpl/sample.php
@@ -21,25 +21,25 @@
                 <div class="span9">
                     <div class="row-fluid">
                         <div class="sample_text">
-                            <h1><?php echo JText::_('COBALT_INSTALL_SAMPLE_DATA_TITLE'); ?></h1>
-                            <p><div class="alert alert-info"><?php echo JText::_('COBALT_INSTALL_SAMPLE_DATA_DESC'); ?></div></p>
+                            <h1><?php echo TextHelper::_('COBALT_INSTALL_SAMPLE_DATA_TITLE'); ?></h1>
+                            <p><div class="alert alert-info"><?php echo TextHelper::_('COBALT_INSTALL_SAMPLE_DATA_DESC'); ?></div></p>
                             <form action="index.php?view=import" method="post" name="adminForm" id="adminForm" class="inline-form"  >
-                                <input type="submit" value="<?php echo JText::_('COBALT_INSTALL_SAMPLE_BUTTON'); ?>" class="btn btn-primary btn-large" />
+                                <input type="submit" value="<?php echo TextHelper::_('COBALT_INSTALL_SAMPLE_BUTTON'); ?>" class="btn btn-primary btn-large" />
                                 <input type="hidden" name="id" value="1" />
                                 <input type="hidden" name="task" value="installSampleData" />
                                 <input type="hidden" name="controller" value="import" />
                                 <input type="hidden" name="view" value="import" />
                                 <input type="hidden" name="layout" value="sample" />
-                                <?php echo JHtml::_('form.token'); ?>
+
                             </form>
                             <form action="index.php?view=import" method="post" name="adminForm" id="adminForm" class="inline-form"  >
-                                <input type="submit" value="<?php echo JText::_('COBALT_REMOVE_SAMPLE_BUTTON'); ?>" class="btn btn-danger btn-large" />
+                                <input type="submit" value="<?php echo TextHelper::_('COBALT_REMOVE_SAMPLE_BUTTON'); ?>" class="btn btn-danger btn-large" />
                                 <input type="hidden" name="id" value="1" />
                                 <input type="hidden" name="task" value="removeSampleData" />
                                 <input type="hidden" name="controller" value="import" />
                                 <input type="hidden" name="view" value="import" />
                                 <input type="hidden" name="layout" value="sample" />
-                                <?php echo JHtml::_('form.token'); ?>
+
                             </form>
                         </div>
                     </div>
diff --git a/src/Cobalt/View/Branding/tmpl/default.php b/src/Cobalt/View/Branding/tmpl/default.php
index 04d038fc..f8e826e7 100644
--- a/src/Cobalt/View/Branding/tmpl/default.php
+++ b/src/Cobalt/View/Branding/tmpl/default.php
@@ -19,32 +19,32 @@
                 <div class="span9">
                     <form enctype="multipart/form-data" action="index.php?view=branding" method="post" name="adminForm" id="adminForm">
                         <fieldset class="adminform">
-                            <legend><h3><?php echo JText::_("COBALT_PREVIEW"); ?></h3></legend>
+                            <legend><h3><?php echo TextHelper::_("COBALT_PREVIEW"); ?></h3></legend>
                             <table cellspacing="0" cellpadding="0" class="table table-striped table-hover">
                                 <thead>
-                                    <th><?php echo JText::_("COBALT_ADMIN_GENERIC_HEADER"); ?></th>
-                                    <th><?php echo JText::_("COBALT_ADMIN_GENERIC_HEADER"); ?></th>
-                                    <th><?php echo JText::_("COBALT_ADMIN_GENERIC_HEADER"); ?></th>
-                                    <th><?php echo JText::_("COBALT_ADMIN_GENERIC_HEADER"); ?></th>
+                                    <th><?php echo TextHelper::_("COBALT_ADMIN_GENERIC_HEADER"); ?></th>
+                                    <th><?php echo TextHelper::_("COBALT_ADMIN_GENERIC_HEADER"); ?></th>
+                                    <th><?php echo TextHelper::_("COBALT_ADMIN_GENERIC_HEADER"); ?></th>
+                                    <th><?php echo TextHelper::_("COBALT_ADMIN_GENERIC_HEADER"); ?></th>
                                 </thead>
                                 <tbody>
                                         <tr class='cobalt_row_0'>
-                                            <td><a href="javascript:void(0);"><?php echo JText::_("COBALT_ADMIN_GENERIC_TEXT"); ?></a></td>
-                                            <td><a href="javascript:void(0);"><?php echo JText::_("COBALT_ADMIN_GENERIC_TEXT"); ?></a></td>
-                                            <td><a href="javascript:void(0);"><?php echo JText::_("COBALT_ADMIN_GENERIC_TEXT"); ?></a></td>
-                                            <td><a href="javascript:void(0);"><?php echo JText::_("COBALT_ADMIN_GENERIC_TEXT"); ?></a></td>
+                                            <td><a href="javascript:void(0);"><?php echo TextHelper::_("COBALT_ADMIN_GENERIC_TEXT"); ?></a></td>
+                                            <td><a href="javascript:void(0);"><?php echo TextHelper::_("COBALT_ADMIN_GENERIC_TEXT"); ?></a></td>
+                                            <td><a href="javascript:void(0);"><?php echo TextHelper::_("COBALT_ADMIN_GENERIC_TEXT"); ?></a></td>
+                                            <td><a href="javascript:void(0);"><?php echo TextHelper::_("COBALT_ADMIN_GENERIC_TEXT"); ?></a></td>
                                         </tr>
                                         <tr class='cobalt_row_1'>
-                                            <td><?php echo JText::_("COBALT_ADMIN_GENERIC_TEXT"); ?></td>
-                                            <td><?php echo JText::_("COBALT_ADMIN_GENERIC_TEXT"); ?></td>
-                                            <td><?php echo JText::_("COBALT_ADMIN_GENERIC_TEXT"); ?></td>
-                                            <td><?php echo JText::_("COBALT_ADMIN_GENERIC_TEXT"); ?></td>
+                                            <td><?php echo TextHelper::_("COBALT_ADMIN_GENERIC_TEXT"); ?></td>
+                                            <td><?php echo TextHelper::_("COBALT_ADMIN_GENERIC_TEXT"); ?></td>
+                                            <td><?php echo TextHelper::_("COBALT_ADMIN_GENERIC_TEXT"); ?></td>
+                                            <td><?php echo TextHelper::_("COBALT_ADMIN_GENERIC_TEXT"); ?></td>
                                         </tr>
                                 </tbody>
                             </table>
                         </fieldset>
                         <fieldset class="adminform">
-                            <legend><h3><?php echo JText::_("COBALT_ADMIN_UPLOAD_LOGO"); ?></h3></legend>
+                            <legend><h3><?php echo TextHelper::_("COBALT_ADMIN_UPLOAD_LOGO"); ?></h3></legend>
                                 <div class="fileupload fileupload-new" data-provides="fileupload">
                                   <div class="fileupload-new thumbnail" style="width: 200px; height: 150px;">
                                     <?php if ( isset($this->site_logo) ) { ?>
@@ -55,28 +55,28 @@
                                 </div>
                                   <div id="site-logo-preview" class="fileupload-preview fileupload-exists thumbnail" style="max-width: 200px; max-height: 150px; line-height: 20px;"></div>
                                   <div>
-                                    <span class="btn btn-file btn-primary"><span class="fileupload-new"><?php echo JText::_('COBALT_SELECT_IMAGE'); ?></span><span class="fileupload-exists"><?php echo JText::_('COBALT_CHANGE'); ?></span><input id="site-logo" name="site_logo" type="file" /></span>
-                                    <a href="#" class="btn fileupload-exists" data-dismiss="fileupload"><?php echo JText::_('COBALT_REMOVE'); ?></a>
+                                    <span class="btn btn-file btn-primary"><span class="fileupload-new"><?php echo TextHelper::_('COBALT_SELECT_IMAGE'); ?></span><span class="fileupload-exists"><?php echo TextHelper::_('COBALT_CHANGE'); ?></span><input id="site-logo" name="site_logo" type="file" /></span>
+                                    <a href="#" class="btn fileupload-exists" data-dismiss="fileupload"><?php echo TextHelper::_('COBALT_REMOVE'); ?></a>
                                   </div>
                                 </div>
                         </fieldset>
                         <fieldset class="adminform">
-                            <legend><h3><?php echo JText::_("COBALT_ADMIN_SITE_NAME"); ?></h3></legend>
+                            <legend><h3><?php echo TextHelper::_("COBALT_ADMIN_SITE_NAME"); ?></h3></legend>
                             <input type="text" class="form-control" id="site-name" name="site_name" value="<?php echo $this->site_name; ?>" />
                         </fieldset>
                         <fieldset class="adminform">
-                            <legend><h3><?php echo JText::_("COBALT_ADMIN_CHOOSE_THEME"); ?></h3></legend>
+                            <legend><h3><?php echo TextHelper::_("COBALT_ADMIN_CHOOSE_THEME"); ?></h3></legend>
                                 <label class="checkbox">
                                     <input type="radio" name="id" value="1" <?php if ($this->themes[0]['assigned']) { echo "checked"; } ?> />
-                                    <?php echo JText::_("COBALT_ADMIN_STANDARD"); ?>
+                                    <?php echo TextHelper::_("COBALT_ADMIN_STANDARD"); ?>
                                 </label>
                                 <label class="checkbox">
                                     <input type="radio" name="id" value="2" <?php if ($this->themes[1]['assigned']) { echo "checked"; } ?> >
-                                    <?php echo JText::_("COBALT_ADMIN_USER_DEFINED"); ?>
+                                    <?php echo TextHelper::_("COBALT_ADMIN_USER_DEFINED"); ?>
                                 </label>
                         </fieldset>
                         <fieldset id="customization_area" class="adminform">
-                            <legend><h3><?php echo JText::_("COBALT_ADMIN_THEME_CUSTOMIZATION"); ?></h3></legend>
+                            <legend><h3><?php echo TextHelper::_("COBALT_ADMIN_THEME_CUSTOMIZATION"); ?></h3></legend>
                             <div id="customization_content"></div>
                         </fieldset>
                         <div>
@@ -86,26 +86,26 @@
                             <input type="hidden" name="block_btn_border" id="block-btn-border" value="" />
                             <input type="hidden" name="feature_btn_border" id="feature-btn-border" value="" />
                             <input type="hidden" name="feature_btn_bg" id="feature-btn-bg" value="" />
-                            <?php echo JHtml::_('form.token'); ?>
+
                         </div>
                     </form>
                     <div id="themes" style="display:none;">
                         <div id="1">
                             <ul class="list-unstyled adminlist cobaltadminlist">
                                 <li>
-                                    <label><b><?php echo JText::_("COBALT_ADMIN_GENERIC_HEADER"); ?></b></label>
+                                    <label><b><?php echo TextHelper::_("COBALT_ADMIN_GENERIC_HEADER"); ?></b></label>
                                     <input class="hascolorpicker inputbox branding-input" type="text" name="header" data-css-class=".navbar-inner" data-css-style="background" value="<?php echo $this->themes[0]['header']; ?>"><div class="colorwheel"></div>
-                                    <label><b><?php echo JText::_("COBALT_ADMIN_TABS_HOVER"); ?></b></label>
+                                    <label><b><?php echo TextHelper::_("COBALT_ADMIN_TABS_HOVER"); ?></b></label>
                                     <input class="hascolorpicker branding-input inputbox" type="text" name="tabs_hover" data-css-class=".navbar .nav > li > a" data-css-style="hover-background" value="<?php echo $this->themes[0]['tabs_hover']; ?>" ><div class="colorwheel"></div>
-                                    <label><b><?php echo JText::_("COBALT_ADMIN_TABS_HOVER_TEXT"); ?></b></label>
+                                    <label><b><?php echo TextHelper::_("COBALT_ADMIN_TABS_HOVER_TEXT"); ?></b></label>
                                     <input class="hascolorpicker branding-input inputbox" type="text" name="tabs_hover_text" data-css-class=".navbar .nav > li > a" data-css-style="hover-color" value="<?php echo $this->themes[0]['tabs_hover_text']; ?>" ><div class="colorwheel"></div>
-                                    <label><b><?php echo JText::_("COBALT_ADMIN_TABLE_HEADER_ROW"); ?></b></label>
+                                    <label><b><?php echo TextHelper::_("COBALT_ADMIN_TABLE_HEADER_ROW"); ?></b></label>
                                     <input class="hascolorpicker branding-input inputbox" type="text" name="table_header_row" data-css-class=".table th" data-css-style="background" value="<?php echo $this->themes[0]['table_header_row']; ?>" ><div class="colorwheel"></div>
-                                    <label><b><?php echo JText::_("COBALT_ADMIN_TABLE_HEADER_TEXT"); ?></b></label>
+                                    <label><b><?php echo TextHelper::_("COBALT_ADMIN_TABLE_HEADER_TEXT"); ?></b></label>
                                     <input class="hascolorpicker branding-input inputbox" type="text" name="table_header_text" data-css-class=".table th" data-css-style="color" value="<?php echo $this->themes[0]['table_header_text']; ?>" ><div class="colorwheel"></div>
-                                    <label><b><?php echo JText::_("COBALT_ADMIN_LINK_COLOR"); ?></b></label>
+                                    <label><b><?php echo TextHelper::_("COBALT_ADMIN_LINK_COLOR"); ?></b></label>
                                     <input class="hascolorpicker branding-input inputbox" type="text" name="link" data-css-class=".table tr td a" data-css-style="color" value="<?php echo $this->themes[0]['link']; ?>" ><div class="colorwheel"></div>
-                                    <label><b><?php echo JText::_("COBALT_ADMIN_LINK_HOVER"); ?></b></label>
+                                    <label><b><?php echo TextHelper::_("COBALT_ADMIN_LINK_HOVER"); ?></b></label>
                                     <input class="hascolorpicker branding-input inputbox" type="text" name="link_hover" data-css-class=".table tr td a" data-css-style="hover-color" value="<?php echo $this->themes[0]['link_hover']; ?>" ><div class="colorwheel"></div>
                                 </li>
                             </ul>
@@ -113,19 +113,19 @@
                         <div id="2">
                             <ul class="list-unstyled adminlist cobaltadminlist">
                                <li>
-                                    <label><b><?php echo JText::_("COBALT_ADMIN_GENERIC_HEADER"); ?></b></label>
+                                    <label><b><?php echo TextHelper::_("COBALT_ADMIN_GENERIC_HEADER"); ?></b></label>
                                     <input class="hascolorpicker branding-input inputbox" type="text" name="header" data-css-class=".navbar-inner" data-css-style="background" value="<?php echo $this->themes[1]['header']; ?>"><div class="colorwheel"></div>
-                                    <label><b><?php echo JText::_("COBALT_ADMIN_TABS_HOVER"); ?></b></label>
+                                    <label><b><?php echo TextHelper::_("COBALT_ADMIN_TABS_HOVER"); ?></b></label>
                                     <input class="hascolorpicker branding-input inputbox" type="text" name="tabs_hover" data-css-class=".navbar .nav > li > a" data-css-style="hover-background" value="<?php echo $this->themes[1]['tabs_hover']; ?>" ><div class="colorwheel"></div>
-                                    <label><b><?php echo JText::_("COBALT_ADMIN_TABS_HOVER_TEXT"); ?></b></label>
+                                    <label><b><?php echo TextHelper::_("COBALT_ADMIN_TABS_HOVER_TEXT"); ?></b></label>
                                     <input class="hascolorpicker branding-input inputbox" type="text" name="tabs_hover_text" data-css-class=".navbar .nav > li > a" data-css-style="hover-color" value="<?php echo $this->themes[1]['tabs_hover_text']; ?>" ><div class="colorwheel"></div>
-                                    <label><b><?php echo JText::_("COBALT_ADMIN_TABLE_HEADER_ROW"); ?></b></label>
+                                    <label><b><?php echo TextHelper::_("COBALT_ADMIN_TABLE_HEADER_ROW"); ?></b></label>
                                     <input class="hascolorpicker branding-input inputbox" type="text" name="table_header_row" data-css-class=".table th" data-css-style="background" value="<?php echo $this->themes[1]['table_header_row']; ?>" ><div class="colorwheel"></div>
-                                    <label><b><?php echo JText::_("COBALT_ADMIN_TABLE_HEADER_TEXT"); ?></b></label>
+                                    <label><b><?php echo TextHelper::_("COBALT_ADMIN_TABLE_HEADER_TEXT"); ?></b></label>
                                     <input class="hascolorpicker branding-input inputbox" type="text" name="table_header_text" data-css-class=".table th" data-css-style="color" value="<?php echo $this->themes[1]['table_header_text']; ?>" ><div class="colorwheel"></div>
-                                    <label><b><?php echo JText::_("COBALT_ADMIN_LINK_COLOR"); ?></b></label>
+                                    <label><b><?php echo TextHelper::_("COBALT_ADMIN_LINK_COLOR"); ?></b></label>
                                     <input class="hascolorpicker branding-input inputbox" type="text" name="link" data-css-class=".table tr td a" data-css-style="color"  value="<?php echo $this->themes[1]['link']; ?>" ><div class="colorwheel"></div>
-                                    <label><b><?php echo JText::_("COBALT_ADMIN_LINK_HOVER"); ?></b></label>
+                                    <label><b><?php echo TextHelper::_("COBALT_ADMIN_LINK_HOVER"); ?></b></label>
                                     <input class="hascolorpicker branding-input inputbox" type="text" name="link_hover" data-css-class=".table tr td a" data-css-style="hover-color"  value="<?php echo $this->themes[1]['link_hover']; ?>" ><div class="colorwheel"></div>
                                 </li>
                             </ul>
diff --git a/src/Cobalt/View/Categories/tmpl/default.php b/src/Cobalt/View/Categories/tmpl/default.php
index 14399acc..0ef7d735 100644
--- a/src/Cobalt/View/Categories/tmpl/default.php
+++ b/src/Cobalt/View/Categories/tmpl/default.php
@@ -19,13 +19,13 @@
                     <div class="page-header">
                         <h3>
                             <?php echo $this->toolbar->render(); ?>
-                            <?php echo JText::_('COBALT_NOTE_CATEGORIES'); ?>
+                            <?php echo TextHelper::_('COBALT_NOTE_CATEGORIES'); ?>
                         </h3>
                     </div>
 
                     <div class="alert alert-info">
-                        <?php echo JText::_('COBALT_NOTES_DESC_1'); ?>
-                        <?php echo JText::_('COBALT_NOTES_DESC_2'); ?>
+                        <?php echo TextHelper::_('COBALT_NOTES_DESC_1'); ?>
+                        <?php echo TextHelper::_('COBALT_NOTES_DESC_2'); ?>
                     </div>
                     
                     <form action="index.php?view=categories" method="post" name="adminForm" id="adminForm">
@@ -33,7 +33,7 @@
                             <thead>
                                 <tr>
                                     <th width="1%">
-                                        <input type="checkbox" name="checkall-toggle" value="" title="<?php echo JText::_('JGLOBAL_CHECK_ALL'); ?>" onclick="checkAll(this)" />
+                                        <input type="checkbox" name="checkall-toggle" value="" title="<?php echo TextHelper::_('JGLOBAL_CHECK_ALL'); ?>" onclick="checkAll(this)" />
                                     </th>
                                     <th>
                                         <?php echo TextHelper::_('COBALT_HEADER_NOTE_CATEGORY'); ?>
@@ -47,7 +47,7 @@
                             <input type="hidden" name="boxchecked" value="0" />
                             <input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
                             <input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
-                            <?php echo JHtml::_('form.token'); ?>
+
                         </div>
                     </form>
                 </div>
diff --git a/src/Cobalt/View/Categories/tmpl/edit.php b/src/Cobalt/View/Categories/tmpl/edit.php
index d9b95c38..21d26e30 100644
--- a/src/Cobalt/View/Categories/tmpl/edit.php
+++ b/src/Cobalt/View/Categories/tmpl/edit.php
@@ -42,7 +42,7 @@
                             <input type="hidden" name="id" value="<?php echo $this->category->id; ?>" />
                             <input type="hidden" name="task" value="save" />
                             <input type="hidden" name="model" value="categories" />
-                            <?php echo JHtml::_('form.token'); ?>
+
                         </div>
 
                     </form>
diff --git a/src/Cobalt/View/Cobalt/tmpl/default.php b/src/Cobalt/View/Cobalt/tmpl/default.php
index dfe443dc..990aedaa 100644
--- a/src/Cobalt/View/Cobalt/tmpl/default.php
+++ b/src/Cobalt/View/Cobalt/tmpl/default.php
@@ -14,7 +14,7 @@
         <div class="col-sm-12">
             <?php if (!$this->launch_default) { ?>
                 <div class="alert">
-                <?php echo JText::_('COBALT_YOUR_SETUP_IS').$this->setup_percent.'% '.JText::_('COBALT_COMPLETED'); ?>
+                <?php echo TextHelper::_('COBALT_YOUR_SETUP_IS').$this->setup_percent.'% '.JText::_('COBALT_COMPLETED'); ?>
                     <div class="progress progress-striped">
                         <div class="bar" style="width:<?php echo $this->setup_percent; ?>%;"></div>
                     </div>
@@ -36,7 +36,7 @@
                 <div class="col-md-9">
                     <?php if (!$this->php_version_check) { ?>
                         <div class="alert alert-error">
-                            <?php echo JText::sprintf("COBALT_WARNING_PHP_VERSION_INVALID",$this->php_version); ?>
+                            <?php echo TextHelper::sprintf("COBALT_WARNING_PHP_VERSION_INVALID",$this->php_version); ?>
                         </div>
                     <?php } ?>
                     <div class="row">
@@ -45,30 +45,30 @@
                             <span class="btn btn-danger btn-mini">
                                 <i class="glyphicon glyphicon-remove icon-white tip"></i>
                             </span>
-                            <?php echo JText::_('COBALT_CURL_NOT_INSTALLED'); ?>
+                            <?php echo TextHelper::_('COBALT_CURL_NOT_INSTALLED'); ?>
                             <?php } elseif ( version_compare($this->installedVersion, $this->latestVersion, 'ge') ) { ?>
                                 <span class="btn btn-success btn-mini">
                                     <i class="glyphicon glyphicon-ok icon-white"></i>
                                 </span>
-                                <?php echo JText::sprintf('COBALT_UP_TO_DATE', $this->installedVersion); ?>
+                                <?php echo TextHelper::sprintf('COBALT_UP_TO_DATE', $this->installedVersion); ?>
                             <?php } else {	?>
                                 <span class="btn btn-danger btn-mini">
                                     <i class="glyphicon glyphicon-remove icon-white"></i>
                                 </span>
-                                <?php echo JText::sprintf('COBALT_UPDATE', $this->installedVersion, $this->latestVersion); ?>
-                                <a href="<?php echo $this->updateUrl; ?>" target="_blank"><?php echo JText::_('COBALT_UPDATE_LINK'); ?></a>
+                                <?php echo TextHelper::sprintf('COBALT_UPDATE', $this->installedVersion, $this->latestVersion); ?>
+                                <a href="<?php echo $this->updateUrl; ?>" target="_blank"><?php echo TextHelper::_('COBALT_UPDATE_LINK'); ?></a>
                         <?php } ?>
                         </div>
                     </div>
                     <hr />
                     <div class="panel panel-default">
                         <div class="panel-heading">
-                            <h4 class="panel-title"><?php echo JText::_('COBALT_LATEST_NEWS'); ?></h4>
+                            <h4 class="panel-title"><?php echo TextHelper::_('COBALT_LATEST_NEWS'); ?></h4>
                         </div>
                         <div class="panel-body">
                             <div class="row">
                                 <div class="col-sm-12">
-                                    <div class="alert alert-warning"><?php echo JText::_('COBALT_NO_MATCHING_RESULTS'); ?></div>
+                                    <div class="alert alert-warning"><?php echo TextHelper::_('COBALT_NO_MATCHING_RESULTS'); ?></div>
                                 </div>
                             </div>
                         </div>
diff --git a/src/Cobalt/View/Cobalt/tmpl/help_menu.php b/src/Cobalt/View/Cobalt/tmpl/help_menu.php
index a5580cc1..7e08fc34 100644
--- a/src/Cobalt/View/Cobalt/tmpl/help_menu.php
+++ b/src/Cobalt/View/Cobalt/tmpl/help_menu.php
@@ -12,7 +12,7 @@
 <?php if ($this->help_type != "launch_default") { if (!$this->launch_default) { ?>
     <div class="panel panel-warning">
         <div class="panel-heading">
-            <h4 class="panel-title"><?php echo JText::_('COBALT_QUICK_START'); ?></h4>
+            <h4 class="panel-title"><?php echo TextHelper::_('COBALT_QUICK_START'); ?></h4>
         </div>
         <div class="panel-body">
         <ul class="help_menu nav nav-pills">
@@ -37,16 +37,16 @@
             <div class="alert alert-info">
                 <?php if (!$this->show_update_buttons) { ?>
                     <div class="pull-right">
-                        <a class="btn-mini btn btn-danger" data-toggle="modal" href="#disable_help_hidden" onclick="disableHelp();" id="disable_help_button"><?php echo JText::_('COBALT_DISABLE_HELP'); ?></a>
+                        <a class="btn-mini btn btn-danger" data-toggle="modal" href="#disable_help_hidden" onclick="disableHelp();" id="disable_help_button"><?php echo TextHelper::_('COBALT_DISABLE_HELP'); ?></a>
                     </div>
                 <?php } ?>
-                <h4><?php echo JText::_('COBALT_HELP_'.strtoupper($this->help_type).'_TITLE'); ?></h4>
-                <?php echo JText::_('COBALT_HELP_'.strtoupper($this->help_type).'_DESC'); ?>
+                <h4><?php echo TextHelper::_('COBALT_HELP_'.strtoupper($this->help_type).'_TITLE'); ?></h4>
+                <?php echo TextHelper::_('COBALT_HELP_'.strtoupper($this->help_type).'_DESC'); ?>
             </div>
             <?php if (!$this->step_completed && $this->show_update_buttons) { ?>
                 <div id="help_actions" class="pull-right btn-group">
-                    <a href="javascript:void(0);" onclick="updateConfig('<?php echo $this->help_type; ?>',1);" class="btn-primary btn-large" ><i class="glyphicon glyphicon-check icon-white"></i><?php echo JText::_('COBALT_COMPLETE'); ?></a>
-                    <a href="javascript:void(0);" onclick="updateConfig('<?php echo $this->help_type; ?>',0);" class="btn laterButton" ><i class="glyphicon glyphicon-repeat"></i><?php echo JText::_('COBALT_COMPLETE_LATER'); ?></a>
+                    <a href="javascript:void(0);" onclick="updateConfig('<?php echo $this->help_type; ?>',1);" class="btn-primary btn-large" ><i class="glyphicon glyphicon-check icon-white"></i><?php echo TextHelper::_('COBALT_COMPLETE'); ?></a>
+                    <a href="javascript:void(0);" onclick="updateConfig('<?php echo $this->help_type; ?>',0);" class="btn laterButton" ><i class="glyphicon glyphicon-repeat"></i><?php echo TextHelper::_('COBALT_COMPLETE_LATER'); ?></a>
                 </div>
             <?php } ?>
         </form>
@@ -54,13 +54,13 @@
     <div class="modal hide fade in" id="disable_help_hidden">
         <div class="modal-header">
             <button type="button" class="close" data-dismiss="modal">×</button>
-            <h3><?php echo JText::_('COBALT_DISABLE_HELP_TITLE'); ?></h3>
+            <h3><?php echo TextHelper::_('COBALT_DISABLE_HELP_TITLE'); ?></h3>
         </div>
         <div class="modal-body">
-            <p><?php echo JText::_('COBALT_DISABLE_HELP_DESC'); ?></p>
+            <p><?php echo TextHelper::_('COBALT_DISABLE_HELP_DESC'); ?></p>
         </div>
         <div class="modal-footer">
-            <a href="#" class="btn btn-primary" data-dismiss="modal"><?php echo JText::_('COBALT_CLOSE'); ?></a>
+            <a href="#" class="btn btn-primary" data-dismiss="modal"><?php echo TextHelper::_('COBALT_CLOSE'); ?></a>
         </div>
     </div>
 <?php } }
diff --git a/src/Cobalt/View/Companies/tmpl/company.php b/src/Cobalt/View/Companies/tmpl/company.php
index cde10c85..fd746ad5 100644
--- a/src/Cobalt/View/Companies/tmpl/company.php
+++ b/src/Cobalt/View/Companies/tmpl/company.php
@@ -129,7 +129,7 @@
 
                 <input type="hidden" name="association_id" value="<?php echo $company->id; ?>" />
                 <input type="hidden" name="association_type" value="company">
-                <input type="hidden" name="return" value="<?php echo base64_encode(JUri::current()); ?>" />
+                <input type="hidden" name="return" value="<?php echo base64_encode(Factory::getApplication()->get('uri')->current()); ?>" />
             </form>
         </span>
         <!-- DOCUMENTS -->
diff --git a/src/Cobalt/View/Companycustom/tmpl/default.php b/src/Cobalt/View/Companycustom/tmpl/default.php
index bc978233..eb991280 100644
--- a/src/Cobalt/View/Companycustom/tmpl/default.php
+++ b/src/Cobalt/View/Companycustom/tmpl/default.php
@@ -22,17 +22,17 @@
                     <div class="page-header">
                         <h3>
                             <?php echo $this->toolbar->render(); ?>
-                            <?php echo JText::_('COBALT_COMPANY_CUSTOM_FIELDS'); ?>
+                            <?php echo TextHelper::_('COBALT_COMPANY_CUSTOM_FIELDS'); ?>
                         </h3>
                     </div>
 
-                    <div class="alert alert-info"><?php echo JText::_('COBALT_COMPANY_CUSTOM_FIELDS_DESC'); ?></div>
+                    <div class="alert alert-info"><?php echo TextHelper::_('COBALT_COMPANY_CUSTOM_FIELDS_DESC'); ?></div>
 
                     <table class="table table-striped data-table">
                         <thead>
                             <tr>
                                 <th width="1%">
-                                    <input type="checkbox" name="checkall-toggle" value="" title="<?php echo JText::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Cobalt.selectAll(this)" />
+                                    <input type="checkbox" name="checkall-toggle" value="" title="<?php echo TextHelper::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Cobalt.selectAll(this)" />
                                 </th>
                                 <th>
                                     <?php echo TextHelper::_('COBALT_HEADER_CUSTOM_NAME'); ?>
diff --git a/src/Cobalt/View/Companycustom/tmpl/edit.php b/src/Cobalt/View/Companycustom/tmpl/edit.php
index 8036b6fd..46038b57 100644
--- a/src/Cobalt/View/Companycustom/tmpl/edit.php
+++ b/src/Cobalt/View/Companycustom/tmpl/edit.php
@@ -32,7 +32,7 @@
 
                         <div class="form-group">
                             <label class="col-sm-2 control-label" for="name">
-                                <?php echo JText::_('COBALT_NAME'); ?>
+                                <?php echo TextHelper::_('COBALT_NAME'); ?>
                             </label>
                             <div class="col-sm-10">
                                 <input type="text" class="form-control required" name="name" id="name" value="<?php echo $this->custom->name; ?>" />
@@ -60,7 +60,7 @@
                             <?php } ?>
                             <input type="hidden" name="task" value="save" />
                             <input type="hidden" name="model" value="companycustom" />
-                            <?php echo JHtml::_('form.token'); ?>
+
                         </div>
 
                     </form>
diff --git a/src/Cobalt/View/Config/tmpl/default.php b/src/Cobalt/View/Config/tmpl/default.php
index 2fc4368c..a7e14f3b 100644
--- a/src/Cobalt/View/Config/tmpl/default.php
+++ b/src/Cobalt/View/Config/tmpl/default.php
@@ -23,36 +23,36 @@
                         <div class="page-header">
                             <h3>
                                 <?php echo $this->toolbar->render(); ?>
-                                <?php echo JText::_('COBALT_CONFIG'); ?>
+                                <?php echo TextHelper::_('COBALT_CONFIG'); ?>
                             </h3>
                         </div>
 
                         <ul class="nav nav-tabs" id="myTab">
-                            <li class="active"><a data-toggle="tab" href="#locale"><?php echo JText::_('COBALT_LOCALE'); ?></a></li>
-                            <li><a data-toggle="tab" href="#currency"><?php echo JText::_('COBALT_CURRENCY'); ?></a></li>
-                            <li><a data-toggle="tab" href="#email"><?php echo JText::_('COBALT_EMAIL'); ?></a></li>
+                            <li class="active"><a data-toggle="tab" href="#locale"><?php echo TextHelper::_('COBALT_LOCALE'); ?></a></li>
+                            <li><a data-toggle="tab" href="#currency"><?php echo TextHelper::_('COBALT_CURRENCY'); ?></a></li>
+                            <li><a data-toggle="tab" href="#email"><?php echo TextHelper::_('COBALT_EMAIL'); ?></a></li>
                             <?php // @TODO This should be moved to language files ?>
-                            <!-- <li><a data-toggle="tab" href="#language"><?php echo JText::_('COBALT_LANGUAGE'); ?></a></li> -->
-                            <li><a data-toggle="tab" href="#help"><?php echo JText::_('COBALT_HELP'); ?></a></li>
+                            <!-- <li><a data-toggle="tab" href="#language"><?php echo TextHelper::_('COBALT_LANGUAGE'); ?></a></li> -->
+                            <li><a data-toggle="tab" href="#help"><?php echo TextHelper::_('COBALT_HELP'); ?></a></li>
                         </ul>
                         <div class="tab-content">
                             <div class="tab-pane active" id="locale">
                                  <ul class="list-unstyled adminlist cobaltadminlist">
                                     <li>
-                                        <label><b><?php echo JText::_('COBALT_LANGUAGE'); ?></b></label>
-                                        <select class="form-control" name="site_language" rel="tooltip" data-original-title='<?php echo JText::_('COBALT_SELECT_SITE_LANGUAGE'); ?>' >
+                                        <label><b><?php echo TextHelper::_('COBALT_LANGUAGE'); ?></b></label>
+                                        <select class="form-control" name="site_language" rel="tooltip" data-original-title='<?php echo TextHelper::_('COBALT_SELECT_SITE_LANGUAGE'); ?>' >
                                             <?php echo JHtml::_('select.options', $this->languages, 'value', 'text', $this->language, true);?>
                                         </select>
                                     </li>
                                     <li>
-                                        <label><b><?php echo JText::_('COBALT_TIMEZONE'); ?></b></label>
-                                        <select class="form-control" name="timezone" rel="tooltip" data-original-title='<?php echo JText::_('COBALT_SELECT_COBALT_TIMEZONE'); ?>' >
+                                        <label><b><?php echo TextHelper::_('COBALT_TIMEZONE'); ?></b></label>
+                                        <select class="form-control" name="timezone" rel="tooltip" data-original-title='<?php echo TextHelper::_('COBALT_SELECT_COBALT_TIMEZONE'); ?>' >
                                             <?php echo JHtml::_('select.options', $this->timezones, 'value', 'text', $this->config->timezone, true);?>
                                         </select>
                                     </li>
                                     <li>
-                                        <label><b><?php echo JText::_('COBALT_TIME_FORMAT'); ?></b></label>
-                                        <select class="form-control" name="time_format" rel="tooltip" data-original-title='<?php echo JText::_('COBALT_SELECT_SERVER_TIME_FORMAT'); ?>' >
+                                        <label><b><?php echo TextHelper::_('COBALT_TIME_FORMAT'); ?></b></label>
+                                        <select class="form-control" name="time_format" rel="tooltip" data-original-title='<?php echo TextHelper::_('COBALT_SELECT_SERVER_TIME_FORMAT'); ?>' >
                                             <?php echo JHtml::_('select.options', $this->time_formats, 'value', 'text', $this->config->time_format, true);?>
                                         </select>
                                     </li>
@@ -61,74 +61,74 @@
                             <div class="tab-pane" id="currency">
                                  <ul class="list-unstyled adminlist cobaltadminlist">
                                     <li>
-                                        <label><b><?php echo JText::_('COBALT_CURRENCY'); ?></b></label>
-                                        <input type="text" class="form-control" name="currency" rel="tooltip" data-original-title="<?php echo JText::_('COBALT_CURRENCY_TOOLTIP'); ?>" value="<?php if ( array_key_exists('currency',$this->config ) ) echo $this->config->currency; ?>" />
+                                        <label><b><?php echo TextHelper::_('COBALT_CURRENCY'); ?></b></label>
+                                        <input type="text" class="form-control" name="currency" rel="tooltip" data-original-title="<?php echo TextHelper::_('COBALT_CURRENCY_TOOLTIP'); ?>" value="<?php if ( array_key_exists('currency',$this->config ) ) echo $this->config->currency; ?>" />
                                     </li>
                                 </ul>
                             </div>
                             <div class="tab-pane" id="email">
                                 <div class="alert alert-block">
                                     <a class="close" data-dismiss="alert" href="#">×</a>
-                                    <h4 class="alert-heading"><?php echo JText::_('COBALT_IMAP_SETTINGS_TITLE'); ?></h4>
-                                    <?php echo JText::_('COBALT_IMAP_SETTINGS_DESCRIPTION'); ?>
+                                    <h4 class="alert-heading"><?php echo TextHelper::_('COBALT_IMAP_SETTINGS_TITLE'); ?></h4>
+                                    <?php echo TextHelper::_('COBALT_IMAP_SETTINGS_DESCRIPTION'); ?>
                                 </div>
                                 <?php if (!$this->imap_found) { ?>
                                     <div class="alert alert-danger">
-                                        <?php echo JText::_("COBALT_WARNING_IMAP_NOT_ENABLED"); ?>
+                                        <?php echo TextHelper::_("COBALT_WARNING_IMAP_NOT_ENABLED"); ?>
                                     </div>
                                  <?php } ?>
                                 <ul class="list-unstyled adminlist cobaltadminlist">
                                     <li>
-                                        <label><b><?php echo JText::_('COBALT_IMAP_HOST'); ?></b></label>
-                                        <input type="text" class="form-control" name="imap_host" rel="tooltip" data-original-title="<?php echo JText::_('COBALT_INPUT_IMAP_HOST'); ?>" value="<?php if ( array_key_exists('imap_host',$this->config ) ) echo $this->config->imap_host; ?>" />
+                                        <label><b><?php echo TextHelper::_('COBALT_IMAP_HOST'); ?></b></label>
+                                        <input type="text" class="form-control" name="imap_host" rel="tooltip" data-original-title="<?php echo TextHelper::_('COBALT_INPUT_IMAP_HOST'); ?>" value="<?php if ( array_key_exists('imap_host',$this->config ) ) echo $this->config->imap_host; ?>" />
                                     </li>
                                     <li>
-                                        <label><b><?php echo JText::_('COBALT_IMAP_USER'); ?></b></label>
-                                        <input type="text" class="form-control" name="imap_user" rel="tooltip" data-original-title="<?php echo JText::_('COBALT_INPUT_IMAP_USER'); ?>" value="<?php if ( array_key_exists('imap_user',$this->config ) ) echo $this->config->imap_user; ?>" />
+                                        <label><b><?php echo TextHelper::_('COBALT_IMAP_USER'); ?></b></label>
+                                        <input type="text" class="form-control" name="imap_user" rel="tooltip" data-original-title="<?php echo TextHelper::_('COBALT_INPUT_IMAP_USER'); ?>" value="<?php if ( array_key_exists('imap_user',$this->config ) ) echo $this->config->imap_user; ?>" />
                                     </li>
                                     <li>
-                                        <label><b><?php echo JText::_('COBALT_IMAP_PASS'); ?></b></label>
-                                        <input type="password" class="form-control" name="imap_pass" rel="tooltip" data-original-title="<?php echo JText::_('COBALT_INPUT_IMAP_PASS'); ?>" value="<?php if ( array_key_exists('imap_pass',$this->config ) )  echo $this->config->imap_pass; ?>" />
+                                        <label><b><?php echo TextHelper::_('COBALT_IMAP_PASS'); ?></b></label>
+                                        <input type="password" class="form-control" name="imap_pass" rel="tooltip" data-original-title="<?php echo TextHelper::_('COBALT_INPUT_IMAP_PASS'); ?>" value="<?php if ( array_key_exists('imap_pass',$this->config ) )  echo $this->config->imap_pass; ?>" />
                                     </li>
                                 </ul>
                             </div>
                             <div class="tab-pane" id="language">
                                 <ul class="list-unstyled adminlist cobaltadminlist">
                                     <li>
-                                        <label><b><?php echo JText::_('COBALT_WELCOME_MESSAGE'); ?></b></label>
-                                        <input type="text" class="form-control" name="welcome_message" rel="tooltip" data-original-title="<?php echo JText::_('COBALT_WELCOME_MESSAGE_TOOLTIP'); ?>" value="<?php if ( array_key_exists('welcome_message',$this->config ) ) echo $this->config->welcome_message; ?>" />
+                                        <label><b><?php echo TextHelper::_('COBALT_WELCOME_MESSAGE'); ?></b></label>
+                                        <input type="text" class="form-control" name="welcome_message" rel="tooltip" data-original-title="<?php echo TextHelper::_('COBALT_WELCOME_MESSAGE_TOOLTIP'); ?>" value="<?php if ( array_key_exists('welcome_message',$this->config ) ) echo $this->config->welcome_message; ?>" />
                                     </li>
                                     <li>
-                                        <label><b><?php echo JText::_('COBALT_I_CALL_A_DEAL'); ?></b></label>
-                                        <input type="text" class="form-control" name="lang_deal" rel="tooltip" data-original-title="<?php echo JText::_('COBALT_I_CALL_A_DEAL_TOOLTIP'); ?>" value="<?php if ( array_key_exists('lang_deal',$this->config ) ) echo $this->config->lang_deal; ?>" />
+                                        <label><b><?php echo TextHelper::_('COBALT_I_CALL_A_DEAL'); ?></b></label>
+                                        <input type="text" class="form-control" name="lang_deal" rel="tooltip" data-original-title="<?php echo TextHelper::_('COBALT_I_CALL_A_DEAL_TOOLTIP'); ?>" value="<?php if ( array_key_exists('lang_deal',$this->config ) ) echo $this->config->lang_deal; ?>" />
                                     </li>
                                     <li>
-                                        <label><b><?php echo JText::_('COBALT_I_CALL_A_PERSON'); ?></b></label>
-                                        <input type="text" class="form-control" name="lang_person" rel="tooltip" data-original-title="<?php echo JText::_('COBALT_I_CALL_A_PERSON_TOOLTIP'); ?>" value="<?php if ( array_key_exists('lang_person',$this->config ) ) echo $this->config->lang_person; ?>" />
+                                        <label><b><?php echo TextHelper::_('COBALT_I_CALL_A_PERSON'); ?></b></label>
+                                        <input type="text" class="form-control" name="lang_person" rel="tooltip" data-original-title="<?php echo TextHelper::_('COBALT_I_CALL_A_PERSON_TOOLTIP'); ?>" value="<?php if ( array_key_exists('lang_person',$this->config ) ) echo $this->config->lang_person; ?>" />
                                     </li>
                                     <li>
-                                        <label><b><?php echo JText::_('COBALT_I_CALL_A_COMPANY'); ?></b></label>
-                                        <input type="text" class="form-control" name="lang_company" rel="tooltip" data-original-title="<?php echo JText::_('COBALT_I_CALL_A_COMPANY_TOOLTIP'); ?>" value="<?php if ( array_key_exists('lang_company',$this->config ) )  echo $this->config->lang_company; ?>" />
+                                        <label><b><?php echo TextHelper::_('COBALT_I_CALL_A_COMPANY'); ?></b></label>
+                                        <input type="text" class="form-control" name="lang_company" rel="tooltip" data-original-title="<?php echo TextHelper::_('COBALT_I_CALL_A_COMPANY_TOOLTIP'); ?>" value="<?php if ( array_key_exists('lang_company',$this->config ) )  echo $this->config->lang_company; ?>" />
                                     </li>
                                      <li>
-                                        <label><b><?php echo JText::_('COBALT_I_CALL_A_CONTACT'); ?></b></label>
-                                        <input type="text" class="form-control" name="lang_contact" rel="tooltip" data-original-title="<?php echo JText::_('COBALT_I_CALL_A_CONTACT_TOOLTIP'); ?>" value="<?php if ( array_key_exists('lang_contact',$this->config ) )  echo $this->config->lang_contact; ?>" />
+                                        <label><b><?php echo TextHelper::_('COBALT_I_CALL_A_CONTACT'); ?></b></label>
+                                        <input type="text" class="form-control" name="lang_contact" rel="tooltip" data-original-title="<?php echo TextHelper::_('COBALT_I_CALL_A_CONTACT_TOOLTIP'); ?>" value="<?php if ( array_key_exists('lang_contact',$this->config ) )  echo $this->config->lang_contact; ?>" />
                                     </li>
                                      <li>
-                                        <label><b><?php echo JText::_('COBALT_I_CALL_A_LEAD'); ?></b></label>
-                                        <input type="text" class="form-control" name="lang_lead" rel="tooltip" data-original-title="<?php echo JText::_('COBALT_I_CALL_A_LEAD_TOOLTIP'); ?>" value="<?php if ( array_key_exists('lang_lead',$this->config ) )  echo $this->config->lang_lead; ?>" />
+                                        <label><b><?php echo TextHelper::_('COBALT_I_CALL_A_LEAD'); ?></b></label>
+                                        <input type="text" class="form-control" name="lang_lead" rel="tooltip" data-original-title="<?php echo TextHelper::_('COBALT_I_CALL_A_LEAD_TOOLTIP'); ?>" value="<?php if ( array_key_exists('lang_lead',$this->config ) )  echo $this->config->lang_lead; ?>" />
                                     </li>
                                      <li>
-                                        <label><b><?php echo JText::_('COBALT_I_CALL_A_TASK'); ?></b></label>
-                                        <input type="text" class="form-control" name="lang_task" rel="tooltip" data-original-title="<?php echo JText::_('COBALT_I_CALL_A_TASK_TOOLTIP'); ?>" value="<?php if ( array_key_exists('lang_task',$this->config ) )  echo $this->config->lang_task; ?>" />
+                                        <label><b><?php echo TextHelper::_('COBALT_I_CALL_A_TASK'); ?></b></label>
+                                        <input type="text" class="form-control" name="lang_task" rel="tooltip" data-original-title="<?php echo TextHelper::_('COBALT_I_CALL_A_TASK_TOOLTIP'); ?>" value="<?php if ( array_key_exists('lang_task',$this->config ) )  echo $this->config->lang_task; ?>" />
                                     </li>
                                      <li>
-                                        <label><b><?php echo JText::_('COBALT_I_CALL_AN_EVENT'); ?></b></label>
-                                        <input type="text" class="form-control" name="lang_event" rel="tooltip" data-original-title="<?php echo JText::_('COBALT_I_CALL_AN_EVENT_TOOLTIP'); ?>" value="<?php if ( array_key_exists('lang_event',$this->config ) )  echo $this->config->lang_event; ?>" />
+                                        <label><b><?php echo TextHelper::_('COBALT_I_CALL_AN_EVENT'); ?></b></label>
+                                        <input type="text" class="form-control" name="lang_event" rel="tooltip" data-original-title="<?php echo TextHelper::_('COBALT_I_CALL_AN_EVENT_TOOLTIP'); ?>" value="<?php if ( array_key_exists('lang_event',$this->config ) )  echo $this->config->lang_event; ?>" />
                                     </li>
                                      <li>
-                                        <label><b><?php echo JText::_('COBALT_I_CALL_A_GOAL'); ?></b></label>
-                                        <input type="text" class="form-control" name="lang_goal" rel="tooltip" data-original-title="<?php echo JText::_('COBALT_I_CALL_A_GOAL_TOOLTIP'); ?>" value="<?php if ( array_key_exists('lang_goal',$this->config ) )  echo $this->config->lang_goal; ?>" />
+                                        <label><b><?php echo TextHelper::_('COBALT_I_CALL_A_GOAL'); ?></b></label>
+                                        <input type="text" class="form-control" name="lang_goal" rel="tooltip" data-original-title="<?php echo TextHelper::_('COBALT_I_CALL_A_GOAL_TOOLTIP'); ?>" value="<?php if ( array_key_exists('lang_goal',$this->config ) )  echo $this->config->lang_goal; ?>" />
                                     </li>
                                 </ul>
                             </div>
@@ -136,8 +136,8 @@
                                 <ul class="list-unstyled adminlist cobaltadminlist">
                                      <li>
                                         <label class="checkbox">
-                                            <input type="checkbox" name="show_help" rel="tooltip" data-original-title="<?php echo JText::_('COBALT_SHOW_HELP_TOOLTIP'); ?>" value="1" <?php if ( array_key_exists('show_help',$this->config ) && $this->config->show_help == 1 )  echo "checked='checked'"; ?> />
-                                            <b><?php echo JText::_('COBALT_SHOW_COBALT_CONFIG_HELP'); ?></b>
+                                            <input type="checkbox" name="show_help" rel="tooltip" data-original-title="<?php echo TextHelper::_('COBALT_SHOW_HELP_TOOLTIP'); ?>" value="1" <?php if ( array_key_exists('show_help',$this->config ) && $this->config->show_help == 1 )  echo "checked='checked'"; ?> />
+                                            <b><?php echo TextHelper::_('COBALT_SHOW_COBALT_CONFIG_HELP'); ?></b>
                                         </label>
                                     </li>
                                 </ul>
@@ -147,7 +147,7 @@
                             <input type="hidden" name="id" value="1" />
                             <input type="hidden" name="task" value="save" />
                             <input type="hidden" name="model" value="config" />
-                            <?php echo JHtml::_('form.token'); ?>
+
                         </div>
                     </form>
                 </div>
diff --git a/src/Cobalt/View/Dashboard/Html.php b/src/Cobalt/View/Dashboard/Html.php
index 81aa7927..a9284383 100644
--- a/src/Cobalt/View/Dashboard/Html.php
+++ b/src/Cobalt/View/Dashboard/Html.php
@@ -15,6 +15,7 @@
 use Cobalt\Helper\TemplateHelper;
 use Cobalt\Helper\ActivityHelper;
 use Cobalt\Helper\UsersHelper;
+use Cobalt\Helper\LinkHelper;
 
 // no direct access
 defined( '_CEXEC' ) or die( 'Restricted access' );
diff --git a/src/Cobalt/View/Dashboard/tmpl/default.mobile.php b/src/Cobalt/View/Dashboard/tmpl/default.mobile.php
index 2f3299b8..535fc0ea 100644
--- a/src/Cobalt/View/Dashboard/tmpl/default.mobile.php
+++ b/src/Cobalt/View/Dashboard/tmpl/default.mobile.php
@@ -8,7 +8,9 @@
 # Website: http://www.cobaltcrm.org
 -------------------------------------------------------------------------*/
 // no direct access
-defined( '_CEXEC' ) or die( 'Restricted access' ); ?>
+defined( '_CEXEC' ) or die( 'Restricted access' );
+$uri = Factory::getApplication()->get('uri');
+?>
 
 <script type="text/javascript">
     var loc = "dashboard";
@@ -25,39 +27,39 @@
         <ul data-inset='true' data-role='listview'>
             <li data-theme="c">
                 <a href="<?php echo RouteHelper::_('index.php?view=events'); ?>">
-                <img class='ui-li-icon' src='<?php echo JURI::root(); ?>//media/images/mobile/agenda.png' />
+                <img class='ui-li-icon' src='<?php echo $uri->root(); ?>//media/images/mobile/agenda.png' />
                 <?php echo ucwords(TextHelper::_('COBALT_AGENDA')); ?>
                 <span class='ui-li-count'><?php echo $this->numEvents; ?></span>
                 </a>
             </li>
             <li data-theme="c">
                 <a href="<?php echo RouteHelper::_('index.php?view=deals'); ?>">
-                    <img class='ui-li-icon' src='<?php echo JURI::root(); ?>//media/images/mobile/deals.png' />
+                    <img class='ui-li-icon' src='<?php echo $uri->root(); ?>//media/images/mobile/deals.png' />
                     <?php echo ucwords(TextHelper::_('COBALT_DEALS_HEADER')); ?>
                     <span class='ui-li-count'><?php echo $this->numDeals; ?></span>
                 </a>
             </li>
             <li data-theme="c">
                 <a href="<?php echo RouteHelper::_('index.php?view=people&type=leads'); ?>">
-                    <img class='ui-li-icon' src='<?php echo JURI::root(); ?>//media/images/mobile/leads.png' />
+                    <img class='ui-li-icon' src='<?php echo $uri->root(); ?>//media/images/mobile/leads.png' />
                     <?php echo ucwords(TextHelper::_('COBALT_LEADS')); ?>
                     <span class='ui-li-count'><?php echo $this->numLeads; ?></span>
                 </a>
             </li>
             <li data-theme="c">
                 <a href="<?php echo RouteHelper::_('index.php?view=people&type=not_leads'); ?>">
-                    <img class='ui-li-icon' src='<?php echo JURI::root(); ?>//media/images/mobile/contacts.png' />
+                    <img class='ui-li-icon' src='<?php echo $uri->root(); ?>//media/images/mobile/contacts.png' />
                     <?php echo ucwords(TextHelper::_('COBALT_CONTACTS')); ?>
                     <span class='ui-li-count'><?php echo $this->numContacts; ?></span>
                 </a>
             </li>
             <li data-theme="c">
                 <a href="<?php echo RouteHelper::_('index.php?view=companies'); ?>">
-                    <img class='ui-li-icon' src='<?php echo JURI::root(); ?>//media/images/mobile/companies.png' />
+                    <img class='ui-li-icon' src='<?php echo $uri->root(); ?>//media/images/mobile/companies.png' />
                     <?php echo ucwords(TextHelper::_('COBALT_COMPANIES')); ?>
                     <span class='ui-li-count'><?php echo $this->numCompanies; ?></span>
                 </a>
             </li>
         </ul>
-        <div style="float:right;font-size:8px;"><a href="javascript:void(0);" onclick="window.location='<?php echo RouteHelper::_('index.php?view=dashboard&mobile=no'); ?>';"><?php echo TextHelper::_('COBALT_TOGGLE_DESKTOP_VIEW'); ?></a></div>
+        <div style="float:right;font-size:8px;"><a href="javascript:void(0);" onclick="window.location='<?php echo LinkHelper::viewDashboard(array('mobile' => 'no')); ?>';"><?php echo TextHelper::_('COBALT_TOGGLE_DESKTOP_VIEW'); ?></a></div>
     </div>
diff --git a/src/Cobalt/View/Dashboard/tmpl/default.php b/src/Cobalt/View/Dashboard/tmpl/default.php
index a5473533..3d7cf5ca 100644
--- a/src/Cobalt/View/Dashboard/tmpl/default.php
+++ b/src/Cobalt/View/Dashboard/tmpl/default.php
@@ -46,7 +46,7 @@
                                 <?php $k = $i%2; ?>
                                 <tr class="cobalt_row_'<?php echo $k; ?>">
                                     <td>
-                                        <a href="<?php echo RouteHelper::_('index.php?view=deals&layout=deal&id=' . $deal->id); ?>">
+                                        <a href="<?php echo LinkHelper::viewDeal($deal->id); ?>">
                                             <?php echo $deal->name; ?>
                                         </a>
                                     </td>
diff --git a/src/Cobalt/View/Dashboard/tmpl/latest_activities.php b/src/Cobalt/View/Dashboard/tmpl/latest_activities.php
index 78581cc2..160d2067 100644
--- a/src/Cobalt/View/Dashboard/tmpl/latest_activities.php
+++ b/src/Cobalt/View/Dashboard/tmpl/latest_activities.php
@@ -83,7 +83,7 @@
     <?php if ($new_value != "") { ?>
         <tr class="crmery_row_<?php echo $k; ?>">
             <td><?php echo $link.$name; ?></a></td>
-            <td><?php echo JText::sprintf('COBALT_ACTIVITY_'.strtoupper($activity->action_type),ucwords(str_replace('_',' ',$activity->type)), ucwords(str_replace(' id','',str_replace(' 1','',str_replace('_',' ',$activity->field)))),$old_value,$new_value); ?></td>
+            <td><?php echo TextHelper::sprintf('COBALT_ACTIVITY_'.strtoupper($activity->action_type),ucwords(str_replace('_',' ',$activity->type)), ucwords(str_replace(' id','',str_replace(' 1','',str_replace('_',' ',$activity->field)))),$old_value,$new_value); ?></td>
             <td><?php echo $activity->owner_name; ?></td>
             <td><?php echo DateHelper::getElapsedTime($activity->date,true,true,true,true,true); ?></td>
         </tr>
diff --git a/src/Cobalt/View/Dealcustom/tmpl/default.php b/src/Cobalt/View/Dealcustom/tmpl/default.php
index a009ff1f..e932d969 100644
--- a/src/Cobalt/View/Dealcustom/tmpl/default.php
+++ b/src/Cobalt/View/Dealcustom/tmpl/default.php
@@ -22,17 +22,17 @@
                     <div class="page-header">
                         <h3>
                             <?php echo $this->toolbar->render(); ?>
-                            <?php echo JText::_('COBALT_DEAL_CUSTOM_FIELDS'); ?>
+                            <?php echo TextHelper::_('COBALT_DEAL_CUSTOM_FIELDS'); ?>
                         </h3>
                     </div>
 
-                    <div class="alert alert-info"><?php echo JText::_('COBALT_DEAL_CUSTOM_FIELDS_DESC'); ?></div>
+                    <div class="alert alert-info"><?php echo TextHelper::_('COBALT_DEAL_CUSTOM_FIELDS_DESC'); ?></div>
 
                     <table class="table table-striped data-table">
                         <thead>
                             <tr>
                                 <th width="1%">
-                                    <input type="checkbox" name="checkall-toggle" value="" title="<?php echo JText::_('JGLOBAL_CHECK_ALL'); ?>" onclick="checkAll(this)" />
+                                    <input type="checkbox" name="checkall-toggle" value="" title="<?php echo TextHelper::_('JGLOBAL_CHECK_ALL'); ?>" onclick="checkAll(this)" />
                                 </th>
                                 <th>
                                     <?php echo TextHelper::_('COBALT_HEADER_CUSTOM_NAME'); ?>
diff --git a/src/Cobalt/View/Dealcustom/tmpl/edit.php b/src/Cobalt/View/Dealcustom/tmpl/edit.php
index 457350ec..fc92ecb0 100644
--- a/src/Cobalt/View/Dealcustom/tmpl/edit.php
+++ b/src/Cobalt/View/Dealcustom/tmpl/edit.php
@@ -32,7 +32,7 @@
 
                         <div class="form-group">
                             <label class="col-sm-2 control-label" for="name">
-                                <?php echo JText::_('COBALT_NAME'); ?>
+                                <?php echo TextHelper::_('COBALT_NAME'); ?>
                             </label>
                             <div class="col-sm-10">
                                 <input type="text" class="form-control required" name="name" value="<?php echo $this->custom->name; ?>" />
@@ -58,7 +58,7 @@
                             <input type="hidden" name="id" value="<?php echo $this->custom->id; ?>" />
                             <input type="hidden" name="task" value="save" />
                             <input type="hidden" name="model" value="dealcustom" />
-                            <?php echo JHtml::_('form.token'); ?>
+
                         </div>
                     </form>
 
diff --git a/src/Cobalt/View/Deals/Html.php b/src/Cobalt/View/Deals/Html.php
index f568a545..fe901f6a 100644
--- a/src/Cobalt/View/Deals/Html.php
+++ b/src/Cobalt/View/Deals/Html.php
@@ -11,6 +11,11 @@
 namespace Cobalt\View\Deals;
 
 use Cobalt\Helper\RouteHelper;
+use Cobalt\Helper\LinkHelper;
+use Cobalt\Model\Deal as DealModel;
+use Cobalt\Model\Event as EventModel;
+use Cobalt\Model\Company as CompanyModel;
+use Cobalt\Model\People as PeopleModel;
 use Cobalt\Factory;
 use Cobalt\Helper\UsersHelper;
 use Cobalt\Helper\TemplateHelper;
diff --git a/src/Cobalt/View/Deals/tmpl/deal.php b/src/Cobalt/View/Deals/tmpl/deal.php
index 012cecfd..dffcd207 100644
--- a/src/Cobalt/View/Deals/tmpl/deal.php
+++ b/src/Cobalt/View/Deals/tmpl/deal.php
@@ -284,7 +284,7 @@
 
                 <input type="hidden" name="association_id" value="<?php echo $deal->id; ?>" />
                 <input type="hidden" name="association_type" value="deal">
-                <input type="hidden" name="return" value="<?php echo base64_encode(JUri::current()); ?>" />
+                <input type="hidden" name="return" value="<?php echo base64_encode(Factory::getApplication()->get('uri')->current()); ?>" />
             </form>
         </span>
 
diff --git a/src/Cobalt/View/Deals/tmpl/deal_dock_entry.php b/src/Cobalt/View/Deals/tmpl/deal_dock_entry.php
index 886b3ba8..17ee0275 100644
--- a/src/Cobalt/View/Deals/tmpl/deal_dock_entry.php
+++ b/src/Cobalt/View/Deals/tmpl/deal_dock_entry.php
@@ -12,7 +12,7 @@
 
 $deal = $this->deal; $k = $this->offset;
 echo '<tr class="cobalt_row_'.$k.'">';
-    echo '<td><a href="'.RouteHelper::_('index.php?view=deals&layout=deal&id='.$deal->id).'">'.$deal->name.'</a></td>';
+    echo '<td><a href="'.LinkHelper::viewDeal($deal->id).'">'.$deal->name.'</a></td>';
     echo '<td>'.$deal->owner_first_name.' '.$deal->owner_last_name.'</td>';
     echo '<td><div class="deal-status-'.strtolower($deal->status_name).'"></div></td>';
     echo '<td><span class="amount">'.ConfigHelper::getConfigValue('currency').$deal->amount.'</span></td>';
diff --git a/src/Cobalt/View/Deals/tmpl/default.mobile.php b/src/Cobalt/View/Deals/tmpl/default.mobile.php
index 478f7a7f..eac588de 100644
--- a/src/Cobalt/View/Deals/tmpl/default.mobile.php
+++ b/src/Cobalt/View/Deals/tmpl/default.mobile.php
@@ -32,7 +32,7 @@
                     if ($i==0 || substr_compare($deal->name,$this->dealList[$i-1]['name'],0,1)) {
                         echo "<li data-role='list-divider'>".ucfirst(substr($deal->name,0,1))."</li>";
                     }
-                    echo '<li data-filtertext="'.$deal->name.'" ><a href="'.RouteHelper::_('index.php?view=deals&layout=deal&id='.$deal->id).'">'.$deal->name.'</a></li>';
+                    echo '<li data-filtertext="'.$deal->name.'" ><a href="'.LinkHelper::viewDeal($deal->id).'">'.$deal->name.'</a></li>';
 
                 }
         ?>
diff --git a/src/Cobalt/View/Deals/tmpl/entry.php b/src/Cobalt/View/Deals/tmpl/entry.php
index bc0e09c7..2651b811 100644
--- a/src/Cobalt/View/Deals/tmpl/entry.php
+++ b/src/Cobalt/View/Deals/tmpl/entry.php
@@ -22,7 +22,7 @@
     <td><input type="checkbox" class="export" name="ids[]" value="<?php echo $deal->id; ?>" /></td>
     <td id="list_<?php echo $deal->id; ?>">
         <div class="title_holder">
-            <a href="<?php echo RouteHelper::_('index.php?view=deals&layout=deal&id='.$deal->id); ?>"><?php echo $deal->name; ?></a>
+            <a href="<?php echo LinkHelper::viewDeal($deal->id); ?>"><?php echo $deal->name; ?></a>
         </div>
     </td>
     <td class="company">
diff --git a/src/Cobalt/View/Emails/tmpl/admin.use.php b/src/Cobalt/View/Emails/tmpl/admin.use.php
index bbd491c1..1e88be19 100644
--- a/src/Cobalt/View/Emails/tmpl/admin.use.php
+++ b/src/Cobalt/View/Emails/tmpl/admin.use.php
@@ -11,7 +11,7 @@
 defined( '_CEXEC' ) or die( 'Restricted access' ); ?>
 
 <p>
-    <?php echo JText::sprintf('COBALT_ADMIN_USE_EMAIL_HEADER',DateHelper::formatDate($starting_date),DateHelper::formatDate($ending_date)); ?>
+    <?php echo TextHelper::sprintf('COBALT_ADMIN_USE_EMAIL_HEADER',DateHelper::formatDate($starting_date),DateHelper::formatDate($ending_date)); ?>
 </p>
 
 <table>
diff --git a/src/Cobalt/View/Emails/tmpl/coffee.report.php b/src/Cobalt/View/Emails/tmpl/coffee.report.php
index 0d1ac4f2..8b8367ed 100644
--- a/src/Cobalt/View/Emails/tmpl/coffee.report.php
+++ b/src/Cobalt/View/Emails/tmpl/coffee.report.php
@@ -8,12 +8,14 @@
 # Website: http://www.cobaltcrm.org
 -------------------------------------------------------------------------*/
 // no direct access
-defined( '_CEXEC' ) or die( 'Restricted access' ); ?>
+defined( '_CEXEC' ) or die( 'Restricted access' );
+$uri = Factory::getApplication()->get('uri');
+?>
 
 <table width="600" cellpadding="0" cellspacing="10" border="0" align="center" style="font-family:Arial, Helvetica, sans-serif; font-size:11px;">
     <tr>
         <td width="300" height="60" valign="top">
-            <a href="<?php echo JURI::base(); ?>"><?php echo JURI::base(); ?></a>
+            <a href="<?php echo $uri->base(); ?>"><?php echo $uri->base(); ?></a>
         </td>
         <td width="300" height="60" valign="top" align="right">
       <p><strong><?php echo TextHelper::_('COBALT_MORNING_COFFEE_REPORT_TITLE') ?> <?php echo $this->user->first_name.' '.$this->user->last_name; ?><br><?php echo TextHelper::_('COBALT_SUMMARY_FOR'); ?> <?php echo DateHelper::formatDate(date('Y-m-d')); ?></strong> <br>
@@ -44,7 +46,7 @@
                 if ($n > 0) { foreach ($this->stages as $stage) { ?>
                 <tr>
                     <td style="color: #<?php echo $stage['color']; ?>;"><?php echo $stage['name']; ?>
-                        <br /><a href="<?php echo JURI::base().'index.php?view=deals&stage='.$stage['id']; ?>" style="color:#999999;"><?php echo ucwords(JText::sprintf('COBALT_VIEW_DEALS',ucwords($stage['name']))); ?></a>
+                        <br /><a href="<?php echo \Cobalt\Helper\LinkHelper::viewDeals(array('stage' => $stage['id'])); ?>" style="color:#999999;"><?php echo ucwords(JText::sprintf('COBALT_VIEW_DEALS',ucwords($stage['name']))); ?></a>
                     </td>
                       <td width="75" align="right" style="color: #<?php echo $stage['color']; ?>;" id="<?php echo $stage['name']; ?>_today">
                           <?php echo ConfigHelper::getCurrency(); ?><?php echo $stage['amount']; ?>
diff --git a/src/Cobalt/View/Events/tmpl/event.mobile.php b/src/Cobalt/View/Events/tmpl/event.mobile.php
index 1d9040bc..266c5d14 100644
--- a/src/Cobalt/View/Events/tmpl/event.mobile.php
+++ b/src/Cobalt/View/Events/tmpl/event.mobile.php
@@ -55,7 +55,7 @@
                     <?php } ?>
                     <?php if ( array_key_exists('home_address_1',$person) && $person['home_address_1']!="") { ?>
                     <li>
-                        <a href="<?php echo RouteHelper::_('index.php?view=people&layout=directions&id='.$person['id']); ?>">
+                        <a href="<?php echo LinkHelperviewPerson($person['id'], array('layout' => 'directions')); ?>">
                             <?php if ( array_key_exists('home_address_1',$person) ) echo $person['home_address_1'].' '.$person['home_city'].', '.$person['home_state'].' '.$person['home_zip']; ?>
                         </a>
                     </li>
@@ -94,7 +94,7 @@
                 <h3><?php echo ucwords(TextHelper::_('COBALT_ASSOCIATED_DEALS')); ?></h3>
                 <ul data-inset='true' data-role='listview' data-theme="c">
                     <li>
-                        <a href="<?php echo RouteHelper::_('index.php?view=deals&layout=deal&id='.$event['association_id']); ?>">
+                        <a href="<?php echo LinkHelper::viewDeal($event['association_id']); ?>">
                             <h3><?php echo $event['deal_name']; ?></h3>
                             <div class="ui-li-count"><?php echo ConfigHelper::getCurrency().$event['deal_amount']; ?></div>
                         </a>
diff --git a/src/Cobalt/View/Formwizard/tmpl/default.php b/src/Cobalt/View/Formwizard/tmpl/default.php
index ad851da1..912b8abd 100644
--- a/src/Cobalt/View/Formwizard/tmpl/default.php
+++ b/src/Cobalt/View/Formwizard/tmpl/default.php
@@ -21,14 +21,14 @@
                     <div class="page-header">
                         <h3>
                             <?php echo $this->toolbar->render(); ?>
-                            <?php echo JText::_('COBALT_FORM_WIZARD_HEADER'); ?>
+                            <?php echo TextHelper::_('COBALT_FORM_WIZARD_HEADER'); ?>
                         </h3>
                     </div>
                     <table class="table table-striped data-table">
                         <thead>
                             <tr>
                                 <th width="1%">
-                                    <input type="checkbox" name="checkall-toggle" value="" title="<?php echo JText::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Cobalt.selectAll(this)" />
+                                    <input type="checkbox" name="checkall-toggle" value="" title="<?php echo TextHelper::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Cobalt.selectAll(this)" />
                                 </th>
                                 <th>
                                     <?php echo TextHelper::_('COBALT_FORM_HEADER_NAME'); ?>
diff --git a/src/Cobalt/View/Formwizard/tmpl/edit.php b/src/Cobalt/View/Formwizard/tmpl/edit.php
index 98801330..8fcab6b6 100644
--- a/src/Cobalt/View/Formwizard/tmpl/edit.php
+++ b/src/Cobalt/View/Formwizard/tmpl/edit.php
@@ -26,39 +26,39 @@
                             </h3>
                         </div>
                         <div class="form-group">
-                            <label><?php echo JText::_('COBALT_FORM_TYPE'); ?></label>
+                            <label><?php echo TextHelper::_('COBALT_FORM_TYPE'); ?></label>
                             <?php echo $this->form_types; ?>
                         </div>
                         <div class="form-group">
-                            <label><b><?php echo JText::_('COBALT_FORM_NAME'); ?></b></label>
-                            <input type="text" id="name" name="name" class="form-control required" rel="tooltip" data-original-title="<?php echo JText::_('COBALT_NAME_YOUR_FORM'); ?>" value="<?php if(isset($this->form)) echo $this->form->name; ?>">
+                            <label><b><?php echo TextHelper::_('COBALT_FORM_NAME'); ?></b></label>
+                            <input type="text" id="name" name="name" class="form-control required" rel="tooltip" data-original-title="<?php echo TextHelper::_('COBALT_NAME_YOUR_FORM'); ?>" value="<?php if(isset($this->form)) echo $this->form->name; ?>">
                         </div>
                         <div class="form-group">
-                            <label><b><?php echo JText::_('COBALT_FORM_DESCRIPTION'); ?></b></label>
+                            <label><b><?php echo TextHelper::_('COBALT_FORM_DESCRIPTION'); ?></b></label>
                             <textarea class="form-control" id="description" name="description"><?php if(isset($this->form)) echo $this->form->description; ?></textarea>
                         </div>
                         <div class="form-group">
-                            <label><b><?php echo JText::_('COBALT_FORM_FIELDS'); ?></b></label><br />
-                            <input onclick="FormWizard.showFieldCheckboxes()" type="button" class="btn btn-primary" data-toggle="modal" href="#show_fields_button_modal" id="show_fields_button" value="<?php echo JText::_('COBALT_SELECT_FIELDS'); ?>" />
+                            <label><b><?php echo TextHelper::_('COBALT_FORM_FIELDS'); ?></b></label><br />
+                            <input onclick="FormWizard.showFieldCheckboxes()" type="button" class="btn btn-primary" data-toggle="modal" href="#show_fields_button_modal" id="show_fields_button" value="<?php echo TextHelper::_('COBALT_SELECT_FIELDS'); ?>" />
                         </div>
                         <div class="form-group">
-                            <label><b><?php echo JText::_('COBALT_FORM_RETURN_URL'); ?></b></label>
-                            <input type="text" class="form-control" id="return_url" name="return_url" rel="tooltip" data-original-title="<?php echo JText::_('COBALT_RETURN_URL_TOOLTIP'); ?>" value="<?php if(isset($this->form)) echo $this->form->return_url; ?>">
+                            <label><b><?php echo TextHelper::_('COBALT_FORM_RETURN_URL'); ?></b></label>
+                            <input type="text" class="form-control" id="return_url" name="return_url" rel="tooltip" data-original-title="<?php echo TextHelper::_('COBALT_RETURN_URL_TOOLTIP'); ?>" value="<?php if(isset($this->form)) echo $this->form->return_url; ?>">
                         </div>
                         <div class="form-group">
-                            <label><b><?php echo JText::_('COBALT_OWNER'); ?></b></label>
-                            <input class="form-control required" type="text" id="owner_id" name="owner_id_input" rel="tooltip" data-original-title="<?php echo JText::_('COBALT_OWNER_TOOLTIP'); ?>" value="<?php if(isset($this->form)) echo $this->form->owner_name; ?>">
+                            <label><b><?php echo TextHelper::_('COBALT_OWNER'); ?></b></label>
+                            <input class="form-control required" type="text" id="owner_id" name="owner_id_input" rel="tooltip" data-original-title="<?php echo TextHelper::_('COBALT_OWNER_TOOLTIP'); ?>" value="<?php if(isset($this->form)) echo $this->form->owner_name; ?>">
                             <input class="required" type="hidden" id="owner_id_hidden" name="owner_id" value="<?php if ( isset($this->form) ) echo $this->form->owner_id; ?>" />
                         </div>
                         <div class="form-group">
-                            <label><b><?php echo JText::_('COBALT_FORM_HTML'); ?></b></label>
-                            <textarea wrap="off" cols="20" rows="15" class="form-control" id="fields" onclick="//@TODO: selectTextarea(this);" rel="tooltip" data-original-title="<?php echo JText::_('COBALT_FORM_HTML_TOOLTIP'); ?>" name="html"><?php if(isset($this->form)) echo $this->form->html; ?></textarea>
+                            <label><b><?php echo TextHelper::_('COBALT_FORM_HTML'); ?></b></label>
+                            <textarea wrap="off" cols="20" rows="15" class="form-control" id="fields" onclick="//@TODO: selectTextarea(this);" rel="tooltip" data-original-title="<?php echo TextHelper::_('COBALT_FORM_HTML_TOOLTIP'); ?>" name="html"><?php if(isset($this->form)) echo $this->form->html; ?></textarea>
                         </div>
                             <div>
                                 <input type="hidden" name="id" id="form_id" value="<?php echo $this->form->id; ?>" />
                                 <input type="hidden" name="task" value="save" />
                                 <input type="hidden" name="model" value="formwizard" />
-                                <?php echo JHtml::_('form.token'); ?>
+
                             </div>
                         </div>
                         <div class="modal fade" id="show_fields_button_modal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
@@ -66,7 +66,7 @@
                                 <div class="modal-content">
                                     <div class="modal-header">
                                         <button type="button" class="close" data-dismiss="modal">×</button>
-                                        <h3><?php echo JText::_('COBALT_SELECT_FIELDS'); ?></h3>
+                                        <h3><?php echo TextHelper::_('COBALT_SELECT_FIELDS'); ?></h3>
                                     </div>
                                     <div class="modal-body">
                                         <?php if ( isset($this->fields) && count($this->fields) > 0 ) {
diff --git a/src/Cobalt/View/Goals/tmpl/add.php b/src/Cobalt/View/Goals/tmpl/add.php
index e4b3c4fc..ef1514ab 100644
--- a/src/Cobalt/View/Goals/tmpl/add.php
+++ b/src/Cobalt/View/Goals/tmpl/add.php
@@ -23,7 +23,7 @@
                     <div class="goal_img pull-left"><img src="<?php echo $mediaURI; ?>images/win_more_cash.png" /></div>
                     <div class="goal_info_container media-body">
                         <h4><a data-target="#editModal" data-toggle="modal" href="<?php echo RouteHelper::_('index.php?view=goals&layout=edit&type=win_cash&format=raw&tmpl=component'); ?>"><?php echo ucwords(TextHelper::_('COBALT_WIN_MORE_CASH')); ?></a></h4>
-                        <div class="goal_info"><?php echo JText::sprintf('COBALT_CREATE_GOAL_TRACK_CASH',ConfigHelper::getConfigValue('currency')); ?></div>
+                        <div class="goal_info"><?php echo TextHelper::sprintf('COBALT_CREATE_GOAL_TRACK_CASH',ConfigHelper::getConfigValue('currency')); ?></div>
                     </div>
                 </div>
                 <hr />
diff --git a/src/Cobalt/View/Launch/tmpl/default.php b/src/Cobalt/View/Launch/tmpl/default.php
index dd6fcbf1..703bb1d9 100644
--- a/src/Cobalt/View/Launch/tmpl/default.php
+++ b/src/Cobalt/View/Launch/tmpl/default.php
@@ -23,9 +23,9 @@
                         <div class="row-fluid">
                             <div class="rocket"></div>
                             <div class="launch_text">
-                                <h1><?php echo JText::_('COBALT_CONGRATULATIONS'); ?></h1>
-                                <p><?php echo JText::_('COBALT_LAUNCH_TEXT_DESC'); ?></p>
-                                <input type="submit" value="<?php echo JText::_('COBALT_LAUNCH_BUTTON'); ?>" class="btn btn-success btn-large" />
+                                <h1><?php echo TextHelper::_('COBALT_CONGRATULATIONS'); ?></h1>
+                                <p><?php echo TextHelper::_('COBALT_LAUNCH_TEXT_DESC'); ?></p>
+                                <input type="submit" value="<?php echo TextHelper::_('COBALT_LAUNCH_BUTTON'); ?>" class="btn btn-success btn-large" />
                             </div>
                             <input type="hidden" name="id" value="1" />
                             <input type="hidden" name="task" value="save" />
@@ -33,7 +33,7 @@
                             <input type="hidden" name="launch_default" value="1" />
                             <input type="hidden" name="show_launch_message" value="1" />
                             <input type="hidden" name="view" value="cobalt" />
-                            <?php echo JHtml::_('form.token'); ?>
+
                         </div>
                     </form>
                 </div>
diff --git a/src/Cobalt/View/Menu/tmpl/default.php b/src/Cobalt/View/Menu/tmpl/default.php
index e018994f..dff1c6e4 100644
--- a/src/Cobalt/View/Menu/tmpl/default.php
+++ b/src/Cobalt/View/Menu/tmpl/default.php
@@ -21,14 +21,14 @@
                     <form action="<?php echo RouteHelper::_('index.php'); ?>" data-ajax="1" method="post" name="adminForm" id="adminForm" class="form-horizontal" >
                         <div class="page-header">
                             <?php echo $this->toolbar->render(); ?>
-                            <h3><?php echo JText::_('COBALT_EDIT_MENU'); ?></h3>
+                            <h3><?php echo TextHelper::_('COBALT_EDIT_MENU'); ?></h3>
                         </div>
-                        <div class="alert alert-info"><?php echo JText::_('COBALT_EDIT_MENU_DESC'); ?></div>
+                        <div class="alert alert-info"><?php echo TextHelper::_('COBALT_EDIT_MENU_DESC'); ?></div>
                         <?php foreach ($this->menu_template as $menu_item) { ?>
                             <div class="checkbox">
                             <label>
                                 <input type="checkbox" name="menu_items[]" value="<?php echo $menu_item; ?>" <?php if (is_array($this->menu->menu_items) && in_array($menu_item,$this->menu->menu_items)) { echo 'checked="checked"'; } ?> />
-                                <?php echo JText::_('COBALT_'.strtoupper($menu_item)); ?>
+                                <?php echo TextHelper::_('COBALT_'.strtoupper($menu_item)); ?>
                             </label>
                             </div>
                         <?php } ?>
@@ -36,7 +36,7 @@
                             <input type="hidden" name="id" value="1" />
                             <input type="hidden" name="task" value="save" />
                             <input type="hidden" name="model" value="menu" />
-                            <?php echo JHtml::_('form.token'); ?>
+
                         </div>
                     </form>
                 </div>
diff --git a/src/Cobalt/View/People/tmpl/default.mobile.php b/src/Cobalt/View/People/tmpl/default.mobile.php
index f168e6f3..75bd3785 100644
--- a/src/Cobalt/View/People/tmpl/default.mobile.php
+++ b/src/Cobalt/View/People/tmpl/default.mobile.php
@@ -42,7 +42,7 @@
                 <li data-filtertext="<?php echo $person['first_name'].' '.$person['last_name']; ?>">
                     <a href="<?php echo RouteHelper::_('index.php?view=people&layout=person&id='.$person['id']); ?>">
                         <h3 class="ui-li-heading"><?php echo $person['first_name'].' '.$person['last_name']; ?></h3>
-                        <p class="ui-li-desc"><?php echo JText::sprintf('COBALT_MOBILE_PERSON_DESC',$person['position'],$person['company_name']); ?></p>
+                        <p class="ui-li-desc"><?php echo TextHelper::sprintf('COBALT_MOBILE_PERSON_DESC',$person['position'],$person['company_name']); ?></p>
                     </a>
                 </li>
             <?php } ?>
diff --git a/src/Cobalt/View/People/tmpl/person.php b/src/Cobalt/View/People/tmpl/person.php
index ff64ad6c..af567df6 100644
--- a/src/Cobalt/View/People/tmpl/person.php
+++ b/src/Cobalt/View/People/tmpl/person.php
@@ -427,7 +427,7 @@
 
             <input type="hidden" name="association_id" value="<?php echo $person['id']; ?>" />
             <input type="hidden" name="association_type" value="person">
-            <input type="hidden" name="return" value="<?php echo base64_encode(JUri::current()); ?>" />
+            <input type="hidden" name="return" value="<?php echo base64_encode(Factory::getApplication()->get('uri')->current()); ?>" />
         </form>
 	</span>
     <h2 class="dotted"><?php echo TextHelper::_('COBALT_EDIT_DOCUMENTS'); ?></h2>
diff --git a/src/Cobalt/View/Peoplecustom/tmpl/default.php b/src/Cobalt/View/Peoplecustom/tmpl/default.php
index 4803aebe..fa87e2f0 100644
--- a/src/Cobalt/View/Peoplecustom/tmpl/default.php
+++ b/src/Cobalt/View/Peoplecustom/tmpl/default.php
@@ -22,17 +22,17 @@
                     <div class="page-header">
                         <h3>
                             <?php echo $this->toolbar->render(); ?>
-                            <?php echo JText::_('COBALT_PEOPLE_CUSTOM_FIELDS'); ?>
+                            <?php echo TextHelper::_('COBALT_PEOPLE_CUSTOM_FIELDS'); ?>
                         </h3>
                     </div>
 
-                    <div class="alert alert-info"><?php echo JText::_('COBALT_PEOPLE_CUSTOM_FIELDS_DESC'); ?></div>
+                    <div class="alert alert-info"><?php echo TextHelper::_('COBALT_PEOPLE_CUSTOM_FIELDS_DESC'); ?></div>
 
                     <table class="table table-striped data-table">
                         <thead>
                             <tr>
                                 <th width="1%">
-                                    <input type="checkbox" name="checkall-toggle" value="" title="<?php echo JText::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Cobalt.selectAll(this)" />
+                                    <input type="checkbox" name="checkall-toggle" value="" title="<?php echo TextHelper::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Cobalt.selectAll(this)" />
                                 </th>
                                 <th>
                                     <?php echo TextHelper::_('COBALT_HEADER_CUSTOM_NAME'); ?>
diff --git a/src/Cobalt/View/Peoplecustom/tmpl/edit.php b/src/Cobalt/View/Peoplecustom/tmpl/edit.php
index 9fd6952d..6fbd63db 100644
--- a/src/Cobalt/View/Peoplecustom/tmpl/edit.php
+++ b/src/Cobalt/View/Peoplecustom/tmpl/edit.php
@@ -32,7 +32,7 @@
 
                         <div class="form-group">
                             <label class="col-sm-2 control-label" for="name">
-                                <?php echo JText::_('COBALT_NAME'); ?>
+                                <?php echo TextHelper::_('COBALT_NAME'); ?>
                             </label>
                             <div class="col-sm-10">
                                 <input type="text" class="form-control required" name="name" id="name" value="<?php echo $this->custom->name; ?>" />
@@ -58,7 +58,7 @@
                             <input type="hidden" name="id" value="<?php echo $this->custom->id; ?>" />
                             <input type="hidden" name="task" value="save" />
                             <input type="hidden" name="model" value="peoplecustom" />
-                            <?php echo JHtml::_('form.token'); ?>
+
                         </div>
 
                     </form>
diff --git a/src/Cobalt/View/Reports/tmpl/default.php b/src/Cobalt/View/Reports/tmpl/default.php
index 58ec354f..5455c85c 100644
--- a/src/Cobalt/View/Reports/tmpl/default.php
+++ b/src/Cobalt/View/Reports/tmpl/default.php
@@ -9,7 +9,6 @@
 -------------------------------------------------------------------------*/
 // no direct access
 defined( '_CEXEC' ) or die( 'Restricted access' );
-use Cobalt\Helper\TextHelper;
 ?>
 
 <script type="text/javascript">
@@ -27,17 +26,17 @@
         <span class="dropdown">
                 <a class="dropdown-toggle update-toggle-text" href="#" data-toggle="dropdown" role="button" href="javascript:void(0);" id="sales_dashboard_filter_link" ><span class="dropdown-label"><?php echo TextHelper::_('COBALT_ME'); ?></span><span class="caret"></span></a>
                 <ul class="dropdown-menu" role="menu" aria-labelledby="sales_dashboard_filter_link">
-                    <li><a class="filter_member_<?php echo $this->user_id; ?> dropdown_item" onclick="salesDashboardFilter(<?php echo $this->user_id; ?>,null)"><?php echo TextHelper::_('COBALT_ME'); ?></a></li>
+                    <li><a class="filter_member_<?php echo $this->user_id; ?> dropdown_item" href="javascript:void(0);" onclick="CobaltChart.salesDashboardFilter(<?php echo $this->user_id; ?>,null)"><?php echo TextHelper::_('COBALT_ME'); ?></a></li>
                 <?php if ($this->member_role == 'manager') { ?>
-                    <li><a class="filter_team_<?php echo $this->team_id; ?> dropdown_item" onclick="salesDashboardFilter(null,<?php echo $this->team_id; ?>)"><?php echo TextHelper::_('COBALT_MY_TEAM'); ?></a></li>
+                    <li><a class="filter_team_<?php echo $this->team_id; ?> dropdown_item" href="javascript:void(0);" onclick="CobaltChart.salesDashboardFilter(null,<?php echo $this->team_id; ?>)"><?php echo TextHelper::_('COBALT_MY_TEAM'); ?></a></li>
                 <?php } ?>
                 <?php if ($this->member_role == 'exec') { ?>
-                    <li><a class="filter_company dropdown_item" onclick="salesDashboardFilter(null,null)"><?php echo TextHelper::_("COBALT_THE_COMPANY"); ?></a></li>
+                    <li><a class="filter_company dropdown_item" href="javascript:void(0);" onclick="CobaltChart.salesDashboardFilter(null,null)"><?php echo TextHelper::_("COBALT_THE_COMPANY"); ?></a></li>
                 <?php foreach ($this->teams as $title => $text) { ?>
-                    <li><a class="filter_team_<?php echo $text['team_id']; ?> dropdown_item" onclick="salesDashboardFilter(null,<?php echo $text['team_id']; ?>)"><?php echo $text['team_name'].TextHelper::_('COBALT_TEAM_APPEND'); ?></a></li>
+                    <li><a class="filter_team_<?php echo $text['team_id']; ?> dropdown_item" href="javascript:void(0);" onclick="CobaltChart.salesDashboardFilter(null,<?php echo $text['team_id']; ?>)"><?php echo $text['team_name'].TextHelper::_('COBALT_TEAM_APPEND'); ?></a></li>
                 <?php }} ?>
                 <?php foreach ($this->users as $title => $text) {
-                     echo "<li><a class='filter_member_".$text['id']." dropdown_item' onclick=\"salesDashboardFilter(".$text['id'].",null)\">".$text['first_name'].' '.$text['last_name']."</a></li>";
+                     echo "<li><a class='filter_member_".$text['id']." dropdown_item' href='javascript:void(0);' onclick=\"CobaltChart.salesDashboardFilter(".$text['id'].",null)\">".$text['first_name'].' '.$text['last_name']."</a></li>";
                 }?>
             </ul>
         </span>
@@ -46,41 +45,41 @@
 <div class="row-fluid" id="sales_dashboard_graphs">
     <div class="col-md-6">
         <ul class="dash_float_list list-unstyled" id="dash_floats_right">
-            <li class="graph widget">
+            <li class="well well-sm">
+                <p class="lead text-center"><?php echo TextHelper::_('COBALT_DEALS_BY_STAGE_PIE_CHART'); ?></p>
                 <div class="btn-group pull-right">
                     <a class="btn" href="javascript:void(0);" onclick="CobaltChart.showChart('deal_stage', graphData.deal_stage, 'pie');"><i class="glyphicon glyphicon-adjust"></i></a>
                     <a class="btn" href="javascript:void(0);" onclick="CobaltChart.showChart('deal_stage', graphData.deal_stage, 'bar');"><i class="glyphicon glyphicon-align-left"></i></a>
                 </div>
                 <canvas id="deal_stage"></canvas>
-                <div class="-caption"><?php echo TextHelper::_('COBALT_DEALS_BY_STAGE_PIE_CHART'); ?></div>
             </li>
-            <li class="graph widget">
+            <li class="well well-sm">
+                <p class="lead text-center"><?php echo TextHelper::_('COBALT_DEALS_BY_STATUS_PIE_CHART'); ?></p>
                 <div class="btn-group pull-right">
                     <a class="btn" href="javascript:void(0);" onclick="CobaltChart.showChart('deal_status', graphData.deal_status, 'pie');"><i class="glyphicon glyphicon-adjust"></i></a>
                     <a class="btn" href="javascript:void(0);" onclick="CobaltChart.showChart('deal_status', graphData.deal_status, 'bar');"><i class="glyphicon glyphicon-align-left"></i></a>
                 </div>
                 <canvas id="deal_status"></canvas>
-                <div class="-caption"><?php echo TextHelper::_('COBALT_DEALS_BY_STATUS_PIE_CHART'); ?></div>
+            </li>
+            <li class="well well-sm">
+                <p class="lead text-center"><?php echo TextHelper::_('COBALT_MONTHLY_COMMISSIONS'); ?></p>
+                <canvas id="monthly_commissions"></canvas>
             </li>
         </ul>
     </div>
     <div class="col-md-6">
         <ul class="dash_float_list list-unstyled" id="dash_floats_right">
-            <li class="graph widget">
+            <li class="well well-sm">
+                <p class="lead text-center"><?php echo TextHelper::_('COBALT_YEARLY_COMMISSIONS'); ?></p>
                 <canvas id="yearly_commissions"></canvas>
-                <div class="-caption"><?php echo TextHelper::_('COBALT_YEARLY_COMMISSIONS'); ?></div>
             </li>
-            <li class="graph widget">
+            <li class="well well-sm">
+                <p class="lead text-center"><?php echo TextHelper::_('COBALT_YEARLY_REVENUE'); ?></p>
                 <canvas id="yearly_revenue"></canvas>
-                <div class="-caption"><?php echo TextHelper::_('COBALT_YEARLY_REVENUE'); ?></div>
-            </li>
-            <li class="graph widget">
-                <canvas id="monthly_commissions"></canvas>
-                <div class="-caption"><?php echo TextHelper::_('COBALT_MONTHLY_COMMISSIONS'); ?></div>
             </li>
-            <li class="graph widget">
+            <li class="well well-sm">
+                <p class="lead text-center"><?php echo TextHelper::_('COBALT_MONTHLY_REVENUE'); ?></p>
                 <canvas id="monthly_revenue"></canvas>
-                <div class="-caption"><?php echo TextHelper::_('COBALT_MONTHLY_REVENUE'); ?></div>
             </li>
         </ul>
     </div>
diff --git a/src/Cobalt/View/Reports/tmpl/roi_report_header.php b/src/Cobalt/View/Reports/tmpl/roi_report_header.php
index 91b21ad5..00dd2e59 100644
--- a/src/Cobalt/View/Reports/tmpl/roi_report_header.php
+++ b/src/Cobalt/View/Reports/tmpl/roi_report_header.php
@@ -15,8 +15,8 @@
             <th class="checkbox_column"><input type="checkbox" onclick="selectAll(this);" /></th>
             <th><div class="sort_order"><a class="s.name" onclick="sortTable('s.name',this)"><?php echo TextHelper::_('COBALT_REPORTS_SOURCE'); ?></a></div></th>
             <th><div class="sort_order"><a class="count(d.id)" onclick="sortTable('count(d.id)',this)"><?php echo TextHelper::_('COBALT_NUMBER_OF_DEALS'); ?></a></div></th>
-            <th><div class="sort_order"><a class="sum(d.amount)" onclick="sortTable('sum(d.amount)',this)"><?php echo JText::sprintf('COBALT_REVENUE',ConfigHelper::getConfigValue('currency')); ?></a></div></th>
-            <th><div class="sort_order"><a class="s.cost" onclick="sortTable('s.cost',this)"><?php echo JText::sprintf('COBALT_TOTAL_COSTS',ConfigHelper::getConfigValue('currency')); ?></a></div></th>
+            <th><div class="sort_order"><a class="sum(d.amount)" onclick="sortTable('sum(d.amount)',this)"><?php echo TextHelper::sprintf('COBALT_REVENUE',ConfigHelper::getConfigValue('currency')); ?></a></div></th>
+            <th><div class="sort_order"><a class="s.cost" onclick="sortTable('s.cost',this)"><?php echo TextHelper::sprintf('COBALT_TOTAL_COSTS',ConfigHelper::getConfigValue('currency')); ?></a></div></th>
             <th><div class="sort_order"><a class="roi" onclick="sortTable('roi',this)"><?php echo TextHelper::_('COBALT_RETURN_ON_INVESTMENTS'); ?></a></div></th>
         </thead>
         <tbody class="results" id="reports">
diff --git a/src/Cobalt/View/Reports/tmpl/sales_pipeline_filter.php b/src/Cobalt/View/Reports/tmpl/sales_pipeline_filter.php
index 2ff4823e..a8c8efeb 100644
--- a/src/Cobalt/View/Reports/tmpl/sales_pipeline_filter.php
+++ b/src/Cobalt/View/Reports/tmpl/sales_pipeline_filter.php
@@ -18,7 +18,7 @@
         <?php if ( $app->input->get('view') != "print" ) { ?>
             <td><input type="checkbox" name="ids[]" value="<?php echo $report->id; ?>" /></td>
         <?php } ?>
-         <td><a href="<?php echo RouteHelper::_("index.php?view=deals&layout=deal&id=".$report->id); ?>"><?php echo $report->name; ?></a></td>
+         <td><a href="<?php echo LinkHelper::viewDeal($report->id); ?>"><?php echo $report->name; ?></a></td>
          <td><?php echo $report->owner_first_name." ".$report->owner_last_name; ?></td>
          <td><?php echo $report->summary; ?></td>
          <td><?php echo ConfigHelper::getCurrency().$report->amount; ?></td>
diff --git a/src/Cobalt/View/Reports/tmpl/source_report.php b/src/Cobalt/View/Reports/tmpl/source_report.php
index 9d4402bc..8c459c00 100644
--- a/src/Cobalt/View/Reports/tmpl/source_report.php
+++ b/src/Cobalt/View/Reports/tmpl/source_report.php
@@ -23,7 +23,7 @@
 <?php echo $this->menu; ?>
 <script type="text/javascript">
     // add to view.html.php
-    order_url = "<?php echo 'index.php?view=reports&layout=source_report_filter&tmpl=component&format=raw'; ?>";
+    order_url = "<?php echo \Cobalt\Helper\LinkHelper::viewReports(array('layout' => 'source_report_filter', 'tmpl' => 'component', 'format' => 'raw')); ?>";
     order_dir = "<?php echo $this->state->get('Deal.source_report_filter_order_Dir'); ?>";
     order_col = "<?php echo $this->state->get('Deal.source_report_filter_order'); ?>";
 </script>
diff --git a/src/Cobalt/View/Reports/tmpl/source_report_filter.php b/src/Cobalt/View/Reports/tmpl/source_report_filter.php
index 02bba9ef..0cc2194a 100644
--- a/src/Cobalt/View/Reports/tmpl/source_report_filter.php
+++ b/src/Cobalt/View/Reports/tmpl/source_report_filter.php
@@ -18,7 +18,7 @@
         <?php if ( $app->input->get('view') != "print" ) { ?>
          <td><input type="checkbox" name="ids[]" value="<?php echo $report['id']; ?>" /></td>
          <?php } ?>
-         <td><a href="<?php echo RouteHelper::_("index.php?view=deals&layout=deal&id=".$report['id']); ?>"><?php echo $report['name']; ?></a></td>
+         <td><a href="<?php echo LinkHelper::viewDeal($report['id']); ?>"><?php echo $report['name']; ?></a></td>
          <td><?php echo $report['owner_first_name']." ".$report['owner_last_name']; ?></td>
          <td><?php echo ConfigHelper::getCurrency().$report['amount']; ?></td>
          <td><?php echo $report['source_name']; ?></td>
diff --git a/src/Cobalt/View/Sources/tmpl/default.php b/src/Cobalt/View/Sources/tmpl/default.php
index 64a06087..81eb6df2 100644
--- a/src/Cobalt/View/Sources/tmpl/default.php
+++ b/src/Cobalt/View/Sources/tmpl/default.php
@@ -21,20 +21,20 @@
                     <div class="page-header">
                         <h3>
                             <?php echo $this->toolbar->render(); ?>
-                            <?php echo JText::_('COBALT_SOURCES'); ?>
+                            <?php echo TextHelper::_('COBALT_SOURCES'); ?>
                         </h3>
                     </div>
 
                     <div class="alert alert-info">
-                        <?php echo JText::_('COBALT_SOURCES_DESC_1'); ?><br />
-                        <?php echo JText::_('COBALT_SOURCES_DESC_2'); ?>
+                        <?php echo TextHelper::_('COBALT_SOURCES_DESC_1'); ?><br />
+                        <?php echo TextHelper::_('COBALT_SOURCES_DESC_2'); ?>
                     </div>
 
                     <table class="table table-striped data-table">
                         <thead>
                             <tr>
                                 <th width="1%">
-                                    <input type="checkbox" name="checkall-toggle" value="" title="<?php echo JText::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Cobalt.selectAll(this)" />
+                                    <input type="checkbox" name="checkall-toggle" value="" title="<?php echo TextHelper::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Cobalt.selectAll(this)" />
                                 </th>
                                 <th>
                                     <?php echo TextHelper::_('COBALT_HEADER_SOURCE_NAME'); ?>
diff --git a/src/Cobalt/View/Sources/tmpl/edit.php b/src/Cobalt/View/Sources/tmpl/edit.php
index 03fb22c2..bbb5ad70 100644
--- a/src/Cobalt/View/Sources/tmpl/edit.php
+++ b/src/Cobalt/View/Sources/tmpl/edit.php
@@ -30,7 +30,7 @@
 
                         <div class="form-group">
                             <label class="col-sm-2 control-label" for="name">
-                                <?php echo JText::_('COBALT_NAME'); ?>
+                                <?php echo TextHelper::_('COBALT_NAME'); ?>
                             </label>
                             <div class="col-sm-10">
                                 <input type="text" class="form-control" name="name" id="name" value="<?php echo $this->source->name; ?>" />
@@ -39,7 +39,7 @@
 
                         <div class="form-group">
                             <label class="col-sm-2 control-label" for="cost">
-                                <?php echo JText::_('COBALT_HEADER_SOURCE_COST'); ?>
+                                <?php echo TextHelper::_('COBALT_HEADER_SOURCE_COST'); ?>
                             </label>
                             <div class="col-sm-10">
                                 <input type="text" class="form-control" name="cost" id="cost" value="<?php echo $this->source->cost; ?>" />
@@ -48,11 +48,11 @@
 
                         <div class="form-group">
                             <label class="col-sm-2 control-label" for="type">
-                                <?php echo JText::_('COBALT_HEADER_SOURCE_TYPE'); ?>
+                                <?php echo TextHelper::_('COBALT_HEADER_SOURCE_TYPE'); ?>
                             </label>
                             <div class="col-sm-10">
                                 <select class="form-control" name="type" id="type">
-                                    <option value=""><?php echo JText::_('COBALT_SELECT_SOURCE_TYPE'); ?></option>
+                                    <option value=""><?php echo TextHelper::_('COBALT_SELECT_SOURCE_TYPE'); ?></option>
                                     <?php echo JHtml::_('select.options', $this->source_types, 'value', 'text', $this->source->type, true);?>
                                 </select>
                             </div>
@@ -62,7 +62,7 @@
                             <input type="hidden" name="id" value="<?php echo $this->source->id; ?>" />
                             <input type="hidden" name="task" value="save" />
                             <input type="hidden" name="model" value="sources" />
-                            <?php echo JHtml::_('form.token'); ?>
+
                         </div>
                     </form>
                 </div>
diff --git a/src/Cobalt/View/Stages/tmpl/default.php b/src/Cobalt/View/Stages/tmpl/default.php
index 6de1f9ab..9a9a2474 100644
--- a/src/Cobalt/View/Stages/tmpl/default.php
+++ b/src/Cobalt/View/Stages/tmpl/default.php
@@ -22,25 +22,25 @@
                     <div class="page-header">
                         <h3>
                             <?php echo $this->toolbar->render(); ?>
-                            <?php echo JText::_('COBALT_DEAL_STAGES'); ?>
+                            <?php echo TextHelper::_('COBALT_DEAL_STAGES'); ?>
                         </h3>
                     </div>
 
                     <div class="alert alert-info">
-                        <?php echo JText::_('COBALT_DEAL_STAGES_DESC_1'); ?><br />
-                        <?php echo JText::_('COBALT_DEAL_STAGES_DESC_2'); ?>
+                        <?php echo TextHelper::_('COBALT_DEAL_STAGES_DESC_1'); ?><br />
+                        <?php echo TextHelper::_('COBALT_DEAL_STAGES_DESC_2'); ?>
                     </div>
                     
                     <table class="table table-striped data-table">
                         <thead>
                             <tr>
                                 <th>
-                                    <input type="checkbox" name="checkall-toggle" value="" title="<?php echo JText::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Cobalt.selectAll(this)" />
+                                    <input type="checkbox" name="checkall-toggle" value="" title="<?php echo TextHelper::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Cobalt.selectAll(this)" />
                                 </th>
                                 <th>
                                     <?php echo TextHelper::_('COBALT_HEADER_DEAL_STAGE'); ?>
                                 </th>
-                                <th><?php echo JText::_('COBALT_COLOR'); ?></th>
+                                <th><?php echo TextHelper::_('COBALT_COLOR'); ?></th>
                                 <th>
                                     <?php echo TextHelper::_('COBALT_HEADER_PERCENT'); ?>
                                 </th>
diff --git a/src/Cobalt/View/Stages/tmpl/edit.php b/src/Cobalt/View/Stages/tmpl/edit.php
index 0a6fac03..b3b5bf94 100644
--- a/src/Cobalt/View/Stages/tmpl/edit.php
+++ b/src/Cobalt/View/Stages/tmpl/edit.php
@@ -32,7 +32,7 @@
 
                         <div class="form-group">
                             <label class="col-sm-2 control-label" for="name">
-                                <?php echo JText::_('COBALT_NAME'); ?>
+                                <?php echo TextHelper::_('COBALT_NAME'); ?>
                             </label>
                             <div class="col-sm-10">
                                 <input 
@@ -46,7 +46,7 @@ class="form-control"
 
                         <div class="form-group">
                             <label class="col-sm-2 control-label" for="percent">
-                                <?php echo JText::_('COBALT_HEADER_PERCENT'); ?>
+                                <?php echo TextHelper::_('COBALT_HEADER_PERCENT'); ?>
                             </label>
                             <div class="col-sm-8">
                                 <input 
@@ -74,7 +74,7 @@ class="form-control"
 
                         <div class="form-group">
                             <label class="col-sm-2 control-label" for="color">
-                                <?php echo JText::_("COBALT_COLOR"); ?>
+                                <?php echo TextHelper::_("COBALT_COLOR"); ?>
                             </label>
                             <div class="col-sm-10">
                                 <input 
@@ -89,7 +89,7 @@ class="form-control"
 
                         <div class="form-group">
                             <label class="col-sm-2 control-label">
-                                <?php echo JText::_("COBALT_WON_STAGE"); ?>
+                                <?php echo TextHelper::_("COBALT_WON_STAGE"); ?>
                             </label>
                             <div class="col-sm-10">
                                 <input <?php if (isset($this->stage->won) && $this->stage->won == 1) echo "checked='checked'"; ?> type="checkbox" name="won" value="1">
@@ -100,7 +100,7 @@ class="form-control"
                             <input type="hidden" name="id" value="<?php echo isset($this->stage->id) ? $this->stage->id : ''; ?>" />
                             <input type="hidden" name="task" value="save" />
                             <input type="hidden" name="model" value="stages" />
-                            <?php echo JHtml::_('form.token'); ?>
+
                         </div>
                     </form>
                 </div>
diff --git a/src/Cobalt/View/Statuses/tmpl/default.php b/src/Cobalt/View/Statuses/tmpl/default.php
index 660857ef..f93e5cde 100644
--- a/src/Cobalt/View/Statuses/tmpl/default.php
+++ b/src/Cobalt/View/Statuses/tmpl/default.php
@@ -19,17 +19,17 @@
                 <div class="col-md-9">
                     <div class="page-header">
                         <?php echo $this->toolbar->render(); ?>
-                        <h3><?php echo JText::_('COBALT_PEOPLE_STATUSES'); ?></h3>
+                        <h3><?php echo TextHelper::_('COBALT_PEOPLE_STATUSES'); ?></h3>
                     </div>
                     <div class="alert alert-info">
-                        <?php echo JText::_('COBALT_PEOPLE_STATUS_DESC_1'); ?><br />
-                        <?php echo JText::_('COBALT_PEOPLE_STATUS_DESC_2'); ?>
+                        <?php echo TextHelper::_('COBALT_PEOPLE_STATUS_DESC_1'); ?><br />
+                        <?php echo TextHelper::_('COBALT_PEOPLE_STATUS_DESC_2'); ?>
                     </div>
                     <table class="table table-striped data-table">
                         <thead>
                             <tr>
                                 <th width="1%">
-                                    <input type="checkbox" name="checkall-toggle" value="" title="<?php echo JText::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Cobalt.selectAll(this)" />
+                                    <input type="checkbox" name="checkall-toggle" value="" title="<?php echo TextHelper::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Cobalt.selectAll(this)" />
                                 </th>
                                 <th>
                                     <?php echo TextHelper::_('COBALT_HEADER_STATUS_NAME'); ?>
diff --git a/src/Cobalt/View/Statuses/tmpl/edit.php b/src/Cobalt/View/Statuses/tmpl/edit.php
index c3ed45c6..916ba678 100644
--- a/src/Cobalt/View/Statuses/tmpl/edit.php
+++ b/src/Cobalt/View/Statuses/tmpl/edit.php
@@ -27,7 +27,7 @@
 
                         <div class="form-group">
                             <label class="col-sm-2 control-label" for="name">
-                                <?php echo JText::_('COBALT_NAME'); ?>
+                                <?php echo TextHelper::_('COBALT_NAME'); ?>
                             </label>
                             <div class="col-sm-10">
                                 <input type="text" class="form-control" name="name" value="<?php echo $this->status->name; ?>" />
@@ -36,7 +36,7 @@
 
                         <div class="form-group">
                             <label class="col-sm-2 control-label" for="name">
-                                <?php echo JText::_('COBALT_HEADER_STATUS_COLOR'); ?>
+                                <?php echo TextHelper::_('COBALT_HEADER_STATUS_COLOR'); ?>
                             </label>
                             <div class="col-sm-10">
                                 <input 
@@ -53,7 +53,7 @@ class="form-control"
                             <input type="hidden" name="id" value="<?php echo $this->status->id; ?>" />
                             <input type="hidden" name="task" value="save" />
                             <input type="hidden" name="model" value="statuses" />
-                            <?php echo JHtml::_('form.token'); ?>
+
                         </div>
                     </form>
                 </div>
diff --git a/src/Cobalt/View/Templates/tmpl/default.php b/src/Cobalt/View/Templates/tmpl/default.php
index 4020ef6e..5434a67a 100644
--- a/src/Cobalt/View/Templates/tmpl/default.php
+++ b/src/Cobalt/View/Templates/tmpl/default.php
@@ -18,14 +18,14 @@
                 <div class="col-md-9">
                     <div class="page-header">
                         <?php echo $this->toolbar->render(); ?>
-                        <h3><?php echo JText::_('COBALT_TASK_PEOPLE_TEMPLATES'); ?></h3>
+                        <h3><?php echo TextHelper::_('COBALT_TASK_PEOPLE_TEMPLATES'); ?></h3>
                     </div>
-                    <div class="alert alert-info"><?php echo JText::_('COBALT_TASK_PEOPLE_TEMPLATES_DESC_1'); ?></div>
+                    <div class="alert alert-info"><?php echo TextHelper::_('COBALT_TASK_PEOPLE_TEMPLATES_DESC_1'); ?></div>
                     <table class="table table-striped data-table">
                         <thead>
                             <tr>
                                 <th width="1%">
-                                    <input type="checkbox" name="checkall-toggle" value="" title="<?php echo JText::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Cobalt.selectAll(this)" />
+                                    <input type="checkbox" name="checkall-toggle" value="" title="<?php echo TextHelper::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Cobalt.selectAll(this)" />
                                 </th>
                                 <th>
                                     <?php echo TextHelper::_('COBALT_HEADER_TEMPLATE_NAME'); ?>
diff --git a/src/Cobalt/View/Templates/tmpl/edit.php b/src/Cobalt/View/Templates/tmpl/edit.php
index 09dffe05..bf8007cb 100644
--- a/src/Cobalt/View/Templates/tmpl/edit.php
+++ b/src/Cobalt/View/Templates/tmpl/edit.php
@@ -28,29 +28,29 @@
 
                                 <div class="form-group">
                                     <label class="col-sm-2 control-label" for="name">
-                                        <?php echo JText::_('COBALT_NAME'); ?>
+                                        <?php echo TextHelper::_('COBALT_NAME'); ?>
                                     </label>
                                     <div class="col-sm-10">
-                                        <input type="text" class="form-control" name="name" rel="tooltip" data-original-title="<?php echo JText::_('COBALT_NAME_YOUR_WORKFLOW'); ?>" value="<?php echo $this->template->name; ?>" />
+                                        <input type="text" class="form-control" name="name" rel="tooltip" data-original-title="<?php echo TextHelper::_('COBALT_NAME_YOUR_WORKFLOW'); ?>" value="<?php echo $this->template->name; ?>" />
                                     </div>
                                 </div>
 
                                 <div class="form-group">
-                                    <label class="col-sm-2 control-label cobaltfaux-label"><?php echo JText::_('COBALT_HEADER_SOURCE_TYPE'); ?></label>
+                                    <label class="col-sm-2 control-label cobaltfaux-label"><?php echo TextHelper::_('COBALT_HEADER_SOURCE_TYPE'); ?></label>
                                     <div class="col-sm-10">
                                         <label class="radio-inline">
                                           <input type="radio" name="type" value="deal" <?php if($this->template->type == 'deal') echo 'checked'; ?> />
-                                          <?php echo JText::_('COBALT_DEAL'); ?>
+                                          <?php echo TextHelper::_('COBALT_DEAL'); ?>
                                         </label>
 
                                         <label class="radio-inline">
                                           <input type="radio" name="type" value="person" <?php if($this->template->type == 'person') echo 'checked'; ?>/>
-                                          <?php echo JText::_('COBALT_PERSON'); ?>
+                                          <?php echo TextHelper::_('COBALT_PERSON'); ?>
                                         </label>
 
                                         <label class="radio-inline">
                                           <input type="radio" name="type" value="company" <?php if($this->template->type == 'company') echo 'checked'; ?> />
-                                          <?php echo JText::_('COBALT_COMPANY'); ?>
+                                          <?php echo TextHelper::_('COBALT_COMPANY'); ?>
                                         </label>
                                     </div>
                                 </div>
@@ -64,8 +64,8 @@
                                     <div class="col-sm-offset-2 col-sm-10">
                                         <div class="checkbox">
                                             <label>
-                                                <input type="checkbox" name="default" rel="tooltip" data-original-title="<?php echo JText::_('COBALT_NAME_YOUR_WORKFLOW'); ?>"  <?php if($this->template->default) echo 'checked'; ?> />
-                                                <?php echo JText::_("COBALT_MAKE_DEFAULT_TEMPLATE"); ?>
+                                                <input type="checkbox" name="default" rel="tooltip" data-original-title="<?php echo TextHelper::_('COBALT_NAME_YOUR_WORKFLOW'); ?>"  <?php if($this->template->default) echo 'checked'; ?> />
+                                                <?php echo TextHelper::_("COBALT_MAKE_DEFAULT_TEMPLATE"); ?>
                                             </label>
                                         </div>
                                     </div>
@@ -76,7 +76,7 @@
                         <div class="row-fluid">
                             <fieldset class="adminform">
                                 <div class="page-header">
-                                    <h4><?php echo JText::_("COBALT_ENTER_ITEMS"); ?></h4>
+                                    <h4><?php echo TextHelper::_("COBALT_ENTER_ITEMS"); ?></h4>
                                 </div>
                                 <div id="items">
                                     <?php if (isset($this->template->data) && $this->template->data) { foreach ($this->template->data as $data) { ?>
@@ -85,18 +85,18 @@
                                             <table>
                                                 <tr>
                                                     <input type="hidden" name="items[]" value ="<?php echo $data->id; ?>]" />
-                                                    <td><b><?php echo JText::_('COBALT_NAME'); ?></b></td>
-                                                    <td><input class="form-control" type="text" name="names[]" rel="tooltip" data-original-title="<?php echo JText::_('COBALT_EVENT_NAME_TOOLTIP'); ?>" value="<?php echo $data->name; ?>" /></td>
-                                                    <td><b><?php echo JText::_("COBALT_DAY"); ?></b></td>
-                                                    <td><input class="form-control" type="text" name="days[]" rel="tooltip" data-original-title="<?php echo JText::_('COBALT_EVENT_DAY_TOOLTIP'); ?>" value="<?php echo $data->day; ?>" /></td>
-                                                    <td><b><?php echo JText::_("COBALT_HEADER_SOURCE_TYPE"); ?></b></td>
+                                                    <td><b><?php echo TextHelper::_('COBALT_NAME'); ?></b></td>
+                                                    <td><input class="form-control" type="text" name="names[]" rel="tooltip" data-original-title="<?php echo TextHelper::_('COBALT_EVENT_NAME_TOOLTIP'); ?>" value="<?php echo $data->name; ?>" /></td>
+                                                    <td><b><?php echo TextHelper::_("COBALT_DAY"); ?></b></td>
+                                                    <td><input class="form-control" type="text" name="days[]" rel="tooltip" data-original-title="<?php echo TextHelper::_('COBALT_EVENT_DAY_TOOLTIP'); ?>" value="<?php echo $data->day; ?>" /></td>
+                                                    <td><b><?php echo TextHelper::_("COBALT_HEADER_SOURCE_TYPE"); ?></b></td>
                                                     <td>
-                                                        <select class="form-control" rel="tooltip" data-original-title="<?php echo JText::_('COBALT_EVENT_TYPE_TOOLTIP'); ?>" name="types[]">
-                                                            <option value=""><?php echo JText::_('COBALT_SELECT_EVENT_TYPE'); ?></option>
+                                                        <select class="form-control" rel="tooltip" data-original-title="<?php echo TextHelper::_('COBALT_EVENT_TYPE_TOOLTIP'); ?>" name="types[]">
+                                                            <option value=""><?php echo TextHelper::_('COBALT_SELECT_EVENT_TYPE'); ?></option>
                                                               <?php echo JHtml::_('select.options', $this->template_types, 'value', 'text', $data->type, true);?>
                                                         </select>
                                                     </td>
-                                                    <td><a href="#" class="btn btn-danger remove_item"><?php echo JText::_("COBALT_REMOVE"); ?></a></td>
+                                                    <td><a href="#" class="btn btn-danger remove_item"><?php echo TextHelper::_("COBALT_REMOVE"); ?></a></td>
                                                 </tr>
                                             </table>
                                         </div>
@@ -107,18 +107,18 @@
                                                 <table>
                                                     <tr>
                                                         <input type="hidden" name="items[]" value ="" />
-                                                        <td><b><?php echo JText::_('COBALT_NAME'); ?></b></td>
-                                                        <td><input class="form-control" rel="tooltip" data-original-title="<?php echo JText::_('COBALT_EVENT_NAME'); ?>" type="text" name="names[]" value="" /></td>
-                                                        <td><b><?php echo JText::_('COBALT_DAY'); ?></b></td>
-                                                        <td><input class="form-control" type="text" rel="tooltip" data-original-title="<?php echo JText::_('COBALT_EVENT_DAY'); ?>" name="days[]" value="" /></td>
-                                                        <td><b><?php echo JText::_('COBALT_HEADER_SOURCE_TYPE'); ?></b></td>
+                                                        <td><b><?php echo TextHelper::_('COBALT_NAME'); ?></b></td>
+                                                        <td><input class="form-control" rel="tooltip" data-original-title="<?php echo TextHelper::_('COBALT_EVENT_NAME'); ?>" type="text" name="names[]" value="" /></td>
+                                                        <td><b><?php echo TextHelper::_('COBALT_DAY'); ?></b></td>
+                                                        <td><input class="form-control" type="text" rel="tooltip" data-original-title="<?php echo TextHelper::_('COBALT_EVENT_DAY'); ?>" name="days[]" value="" /></td>
+                                                        <td><b><?php echo TextHelper::_('COBALT_HEADER_SOURCE_TYPE'); ?></b></td>
                                                         <td>
-                                                            <select class="form-control" name="types[]" rel="tooltip" data-original-title="<?php echo JText::_('COBALT_EVENT_TYPE'); ?>" >
-                                                                <option value=""><?php echo JText::_('COBALT_SELECT_EVENT_TYPE'); ?></option>
+                                                            <select class="form-control" name="types[]" rel="tooltip" data-original-title="<?php echo TextHelper::_('COBALT_EVENT_TYPE'); ?>" >
+                                                                <option value=""><?php echo TextHelper::_('COBALT_SELECT_EVENT_TYPE'); ?></option>
                                                                   <?php echo JHtml::_('select.options', $this->template_types, 'value', 'text', '', true);?>
                                                             </select>
                                                         </td>
-                                                        <td><a href="javascript:void(0);" class="btn btn-danger remove_item"><?php echo JText::_("COBALT_REMOVE"); ?></a></td>
+                                                        <td><a href="javascript:void(0);" class="btn btn-danger remove_item"><?php echo TextHelper::_("COBALT_REMOVE"); ?></a></td>
                                                     </tr>
                                                 </table>
                                             </div>
@@ -129,7 +129,7 @@
                                 <label>
                                     <a href="#" class="btn btn-success" id="add_item">
                                         <i class="icon-white glyphicon glyphicon-plus-sign"></i>
-                                        <?php echo JText::_('COBALT_ADD_MORE_ITEMS'); ?>
+                                        <?php echo TextHelper::_('COBALT_ADD_MORE_ITEMS'); ?>
                                     </a>
                                 </label>
                             </fieldset>
@@ -140,7 +140,7 @@
                             <?php } ?>
                             <input type="hidden" name="task" value="save" />
                             <input type="hidden" name="model" value="templates" />
-                            <?php echo JHtml::_('form.token'); ?>
+
                         </div>
                     </form>
                     <div style="display:none;" id="item_template">
@@ -149,18 +149,18 @@
                                 <table>
                                     <tr>
                                         <input type="hidden" name="items[]" value ="" />
-                                        <td><b><?php echo JText::_('COBALT_NAME'); ?></b></td>
-                                        <td><input class="form-control" type="text" name="names[]" value="" rel="tooltip" data-original-title="<?php echo JText::_('COBALT_EVENT_NAME'); ?>"  /></td>
-                                        <td><b><?php echo JText::_('COBALT_DAY'); ?></b></td>
-                                        <td><input class="form-control" type="text" name="days[]" value="" rel="tooltip" data-original-title="<?php echo JText::_('COBALT_EVENT_DAY'); ?>"  /></td>
-                                        <td><b><?php echo JText::_('COBALT_HEADER_SOURCE_TYPE'); ?></b></td>
+                                        <td><b><?php echo TextHelper::_('COBALT_NAME'); ?></b></td>
+                                        <td><input class="form-control" type="text" name="names[]" value="" rel="tooltip" data-original-title="<?php echo TextHelper::_('COBALT_EVENT_NAME'); ?>"  /></td>
+                                        <td><b><?php echo TextHelper::_('COBALT_DAY'); ?></b></td>
+                                        <td><input class="form-control" type="text" name="days[]" value="" rel="tooltip" data-original-title="<?php echo TextHelper::_('COBALT_EVENT_DAY'); ?>"  /></td>
+                                        <td><b><?php echo TextHelper::_('COBALT_HEADER_SOURCE_TYPE'); ?></b></td>
                                         <td>
-                                            <select class="form-control" name="types[]" rel="tooltip" data-original-title="<?php echo JText::_('COBALT_EVENT_TYPE'); ?>" >
-                                                <option value=""><?php echo JText::_('COBALT_SELECT_EVENT_TYPE'); ?></option>
+                                            <select class="form-control" name="types[]" rel="tooltip" data-original-title="<?php echo TextHelper::_('COBALT_EVENT_TYPE'); ?>" >
+                                                <option value=""><?php echo TextHelper::_('COBALT_SELECT_EVENT_TYPE'); ?></option>
                                                   <?php echo JHtml::_('select.options', $this->template_types, 'value', 'text', '', true);?>
                                             </select>
                                         </td>
-                                        <td><a href="javascript:void(0);" class="btn btn-danger remove_item"><?php echo JText::_("COBALT_REMOVE"); ?></a></td>
+                                        <td><a href="javascript:void(0);" class="btn btn-danger remove_item"><?php echo TextHelper::_("COBALT_REMOVE"); ?></a></td>
                                     </tr>
                                 </table>
                             </div>
diff --git a/src/Cobalt/View/Users/tmpl/default.php b/src/Cobalt/View/Users/tmpl/default.php
index 057b43e4..bb9f133b 100644
--- a/src/Cobalt/View/Users/tmpl/default.php
+++ b/src/Cobalt/View/Users/tmpl/default.php
@@ -21,7 +21,7 @@
                     <div class="page-header">
                         <h3>
                             <?php echo $this->toolbar->render(); ?>
-                            <?php echo JText::_('COBALT_ADD_TO_ACCOUNT'); ?>
+                            <?php echo TextHelper::_('COBALT_ADD_TO_ACCOUNT'); ?>
                         </h3>
                     </div>
 
@@ -29,7 +29,7 @@
                         <thead>
                             <tr>
                                 <th width="1%">
-                                    <input type="checkbox" name="checkall-toggle" value="" title="<?php echo JText::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Cobalt.selectAll(this)" />
+                                    <input type="checkbox" name="checkall-toggle" value="" title="<?php echo TextHelper::_('JGLOBAL_CHECK_ALL'); ?>" onclick="Cobalt.selectAll(this)" />
                                 </th>
                                 <th>
                                     <?php echo TextHelper::_('COBALT_USERS_HEADER_NAME'); ?>
@@ -54,10 +54,10 @@
                     </table>
                     <div class="clearfix"></div>
                     <div class="alert alert-info clearfix">
-                        <h3><?php echo JText::_("COBALT_USER_ROLES_VISIBILITY"); ?></h3>
-                        <b><?php echo JText::_('COBALT_EXECUTIVE'); ?></b> - <?php echo JText::_('COBALT_EXECUTIVE_DESC'); ?><br />
-                        <b><?php echo JText::_('COBALT_MANAGERS'); ?></b> - <?php echo JText::_('COBALT_MANAGERS_DESC'); ?><br />
-                        <b><?php echo JText::_('COBALT_BASIC_USERS'); ?></b> - <?php echo JText::_('COBALT_BASIC_USERS_DESC'); ?>
+                        <h3><?php echo TextHelper::_("COBALT_USER_ROLES_VISIBILITY"); ?></h3>
+                        <b><?php echo TextHelper::_('COBALT_EXECUTIVE'); ?></b> - <?php echo TextHelper::_('COBALT_EXECUTIVE_DESC'); ?><br />
+                        <b><?php echo TextHelper::_('COBALT_MANAGERS'); ?></b> - <?php echo TextHelper::_('COBALT_MANAGERS_DESC'); ?><br />
+                        <b><?php echo TextHelper::_('COBALT_BASIC_USERS'); ?></b> - <?php echo TextHelper::_('COBALT_BASIC_USERS_DESC'); ?>
                     </div>
                 </div>
             </div>
diff --git a/src/Cobalt/View/Users/tmpl/edit.php b/src/Cobalt/View/Users/tmpl/edit.php
index 101de4ab..4a9d935d 100644
--- a/src/Cobalt/View/Users/tmpl/edit.php
+++ b/src/Cobalt/View/Users/tmpl/edit.php
@@ -31,7 +31,7 @@
                         
                         <div class="form-group">
                             <label class="col-sm-2 control-label" for="uid_name">
-                                <?php echo JText::_('COBALT_SELECT_USER_TO_ADD'); ?>
+                                <?php echo TextHelper::_('COBALT_SELECT_USER_TO_ADD'); ?>
                             </label>
                             <div class="col-sm-10">
                                 <input 
@@ -41,14 +41,14 @@ class="form-control"
                                     id="uid_name" 
                                     name="username" 
                                     rel="tooltip" 
-                                    data-original-title="<?php echo JText::_('COBALT_START_TYPING_JOOMLA_NAME'); ?>" 
+                                    data-original-title="<?php echo TextHelper::_('COBALT_START_TYPING_JOOMLA_NAME'); ?>"
                                     value="<?php if ( isset($this->user) ) echo $this->user->username; ?>"
                                     autocomplete="off">
                             </div>
                         </div>
                         <div class="form-group">
                             <label class="col-sm-2 control-label" for="uid_name">
-                                <?php echo JText::_('COBALT_PASSWORD'); ?>
+                                <?php echo TextHelper::_('COBALT_PASSWORD'); ?>
                             </label>
                             <div class="col-sm-10">
                                 <input 
@@ -58,14 +58,14 @@ class="form-control"
                                     id="uid_name" 
                                     name="password" 
                                     rel="tooltip" 
-                                    data-original-title="<?php echo JText::_('COBALT_START_TYPING_JOOMLA_PASSWORD'); ?>" 
+                                    data-original-title="<?php echo TextHelper::_('COBALT_START_TYPING_JOOMLA_PASSWORD'); ?>"
                                     value=""
                                     autocomplete="off" >
                             </div>
                         </div>
                         <div class="form-group">
                             <label class="col-sm-2 control-label" for="first_name">
-                                <?php echo JText::_('COBALT_FIRST_NAME'); ?>
+                                <?php echo TextHelper::_('COBALT_FIRST_NAME'); ?>
                             </label>
                             <div class="col-sm-10">
                                 <input 
@@ -73,7 +73,7 @@ class="form-control"
                                     class="form-control required" 
                                     type="text" 
                                     rel="tooltip" 
-                                    data-original-title="<?php echo JText::_('COBALT_ENTER_FIRST_NAME_HERE'); ?>" 
+                                    data-original-title="<?php echo TextHelper::_('COBALT_ENTER_FIRST_NAME_HERE'); ?>"
                                     name="first_name" 
                                     id="first_name" 
                                     value="<?php echo $this->user->first_name; ?>" />
@@ -81,7 +81,7 @@ class="form-control required"
                         </div>
                         <div class="form-group">
                             <label class="col-sm-2 control-label" for="last_name">
-                                <?php echo JText::_('COBALT_LAST_NAME'); ?>
+                                <?php echo TextHelper::_('COBALT_LAST_NAME'); ?>
                             </label>
                             <div class="col-sm-10">
                                 <input 
@@ -91,13 +91,13 @@ class="form-control"
                                     name="last_name" 
                                     id="last_name" 
                                     rel="tooltip" 
-                                    data-original-title="<?php echo JText::_('COBALT_ENTER_LAST_NAME_HERE'); ?>" 
+                                    data-original-title="<?php echo TextHelper::_('COBALT_ENTER_LAST_NAME_HERE'); ?>"
                                     value="<?php echo $this->user->last_name; ?>" />
                             </div>
                         </div>
                         <div class="form-group">
                             <label class="col-sm-2 control-label" for="email">
-                                <?php echo JText::_('COBALT_EMAIL'); ?>
+                                <?php echo TextHelper::_('COBALT_EMAIL'); ?>
                             </label>
                             <div class="col-sm-10">
                                 <input 
@@ -107,13 +107,13 @@ class="form-control"
                                     class="form-control" 
                                     name="email" 
                                     rel="tooltip" 
-                                    data-original-title="<?php echo JText::_('COBALT_EDIT_USER_EMAIL'); ?>" 
+                                    data-original-title="<?php echo TextHelper::_('COBALT_EDIT_USER_EMAIL'); ?>"
                                     value="<?php echo $this->user->email; ?>" />
                             </div>
                         </div>
                         <div class="form-group">
                             <label class="col-sm-2 control-label" for="role_type">
-                                <?php echo JText::_('COBALT_MEMBER_ROLE'); ?>
+                                <?php echo TextHelper::_('COBALT_MEMBER_ROLE'); ?>
                             </label>
                             <div class="col-sm-10">
                                 <select 
@@ -122,7 +122,7 @@ class="form-control"
                                     name="role_type" 
                                     id="role_type" 
                                     rel="tooltip" 
-                                    data-original-title="<?php echo JText::_('COBALT_ASSIGN_USER_ROLE'); ?>" 
+                                    data-original-title="<?php echo TextHelper::_('COBALT_ASSIGN_USER_ROLE'); ?>"
                                     onchange="User.updateRole(this)" >
                                     <?php echo JHtml::_('select.options', $this->member_roles, 'value', 'text', $this->user->role_type, true);?>
                                 </select>
@@ -130,7 +130,7 @@ class="form-control"
                         </div>
                         <div class="form-group" id="team_name" <?php if ($this->user->role_type != "manager") { ?> style="display:none;" <?php } ?> >
                             <label class="col-sm-2 control-label" for="team_name">
-                                <?php echo JText::_('COBALT_TEAM_NAME'); ?>
+                                <?php echo TextHelper::_('COBALT_TEAM_NAME'); ?>
                             </label>
                             <div class="col-sm-10">
                                 <input 
@@ -147,7 +147,7 @@ class="form-control"
                         <div class="form-group" style="display:none;" id="team_assignment">
                         <?php } ?>
                             <label class="col-sm-2 control-label" for="team_id">
-                                <?php echo JText::_('COBALT_USERS_HEADER_TEAM'); ?>
+                                <?php echo TextHelper::_('COBALT_USERS_HEADER_TEAM'); ?>
                             </label>
                             <div class="col-sm-10">
                                 <select 
@@ -155,8 +155,8 @@ class="form-control"
                                     id="team_id" 
                                     name="team_id" 
                                     rel="tooltip" 
-                                    data-original-title="<?php echo JText::_('COBALT_ASSIGN_USER_TEAM'); ?>" >
-                                    <option value="0"><?php echo JText::_("COBALT_NONE"); ?></option>
+                                    data-original-title="<?php echo TextHelper::_('COBALT_ASSIGN_USER_TEAM'); ?>" >
+                                    <option value="0"><?php echo TextHelper::_("COBALT_NONE"); ?></option>
                                     <?php echo JHtml::_('select.options', $this->teams, 'team_id', 'name', $this->user->team_id, true);?>
                                 </select>
                             </div>
@@ -164,7 +164,7 @@ class="form-control"
                         <?php if ($this->user->role_type == 'manager') { ?>
                         <div class="form-group" style="display:none;" id="manager_assignment">
                             <label class="col-sm-2 control-label" for="manager_id">
-                                <?php echo JText::_('COBALT_ASSIGN_NEW_MANAGER'); ?><span class="required">*</span>
+                                <?php echo TextHelper::_('COBALT_ASSIGN_NEW_MANAGER'); ?><span class="required">*</span>
                             </label>
                             <div class="col-sm-10">
                                 <select 
@@ -172,8 +172,8 @@ class="form-control"
                                     id="manager_id" 
                                     name="manager_assignment" 
                                     rel="tooltip" 
-                                    data-original-title="<?php echo JText::_('COBALT_ASSIGN_MANAGER'); ?>" >
-                                    <option value=""><?php echo JText::_('COBALT_NEW_MANAGER'); ?></option>
+                                    data-original-title="<?php echo TextHelper::_('COBALT_ASSIGN_MANAGER'); ?>" >
+                                    <option value=""><?php echo TextHelper::_('COBALT_NEW_MANAGER'); ?></option>
                                     <?php echo JHtml::_('select.options', $this->managers, 'value', 'text', '', true);?>
                                 </select>
                             </div>
@@ -181,7 +181,7 @@ class="form-control"
                         <?php } ?>
                         <div class="form-group">
                             <label class="col-sm-2 control-label" for="user_color">
-                                <?php echo JText::_('COBALT_USER_COLOR'); ?>
+                                <?php echo TextHelper::_('COBALT_USER_COLOR'); ?>
                             </label>
                             <div class="col-sm-10">
                                 <input 
@@ -190,7 +190,7 @@ class="form-control"
                                     type="color" 
                                     class="form-control"  
                                     rel="tooltip" 
-                                    data-original-title="<?php echo JText::_('COBALT_USER_COLOR'); ?>" 
+                                    data-original-title="<?php echo TextHelper::_('COBALT_USER_COLOR'); ?>"
                                     name="color" 
                                     value="<?php echo $this->user->color ? $this->user->color : '#84a5f6'; ?>" />
                             </div>
@@ -204,9 +204,9 @@ class="form-control"
                                     type="checkbox" 
                                     name="admin" 
                                     rel="tooltip" 
-                                    data-original-title="<?php echo JText::_('COBALT_IF_CHECKED_ADMINISTRATOR'); ?>" 
+                                    data-original-title="<?php echo TextHelper::_('COBALT_IF_CHECKED_ADMINISTRATOR'); ?>"
                                     <?php echo ($this->user->admin ? 'checked' : ''); ?> />
-                                <?php echo JText::_("COBALT_ADMNISTRATOR"); ?>
+                                <?php echo TextHelper::_("COBALT_ADMNISTRATOR"); ?>
                             </label>
                         </div>
                         <div class="form-group">
@@ -218,9 +218,9 @@ class="form-control"
                                     type="checkbox" 
                                     name="can_delete" 
                                     rel="tooltip" 
-                                    data-original-title="<?php echo JText::_('COBALT_IF_CHECKED_DELETE'); ?>" 
+                                    data-original-title="<?php echo TextHelper::_('COBALT_IF_CHECKED_DELETE'); ?>"
                                     <?php echo ($this->user->can_delete ? 'checked' : ''); ?> />
-                                <?php echo JText::_('COBALT_ALLOWED_TO_DELETE'); ?>
+                                <?php echo TextHelper::_('COBALT_ALLOWED_TO_DELETE'); ?>
                             </label>
                         </div>
                         <div class="form-group">
@@ -232,16 +232,16 @@ class="form-control"
                                     type="checkbox" 
                                     name="exports" 
                                     rel="tooltip" 
-                                    data-original-title="<?php echo JText::_('COBALT_IF_CHECKED_EXPORT'); ?>" 
+                                    data-original-title="<?php echo TextHelper::_('COBALT_IF_CHECKED_EXPORT'); ?>"
                                     <?php echo ($this->user->exports ? 'checked' : ''); ?> />
-                                <?php echo JText::_('COBALT_ALLOWED_TO_EXPORT'); ?>
+                                <?php echo TextHelper::_('COBALT_ALLOWED_TO_EXPORT'); ?>
                             </label>
                         </div>
 
                         <input type="hidden" name="id" value="<?php echo $this->user->id; ?>" />
                         <input type="hidden" name="model" value="user" />
                         <input type="hidden" name="task" value="save" />
-                        <?php echo JHtml::_('form.token'); ?>
+
                     </form>
                 </div>
             </div>
diff --git a/themes/bootstrap/js/cobalt.js b/themes/bootstrap/js/cobalt.js
index 04568edc..8fb108ff 100644
--- a/themes/bootstrap/js/cobalt.js
+++ b/themes/bootstrap/js/cobalt.js
@@ -731,49 +731,18 @@ var Cobalt = {
                 inGraphDataFontSize : 14
             };
 
-            var dealsByStagePie = document.getElementById("dealsByStagePie").getContext("2d");
-            new Chart(dealsByStagePie).Pie(graphData.deal_stage, PieOptions);
-
-            var dealsByStatusPie = document.getElementById("dealsByStatusPie").getContext("2d");
-            new Chart(dealsByStatusPie).Pie(graphData.deal_status, PieOptions);
-
-            var BarOptions = {barShowStroke: false};
-
-            var monthlyRevenue = document.getElementById("monthlyRevenue").getContext("2d");
-            new Chart(monthlyRevenue).Bar(graphData.monthly_revenue, BarOptions);
+            CobaltChart.showChart('dealsByStagePie', graphData.deal_stage,'pie');
+            CobaltChart.showChart('dealsByStatusPie', graphData.deal_status,'pie');
+            CobaltChart.showChart('monthlyRevenue',graphData.monthly_revenue,'bar')
 
         }
         if (typeof loc !== 'undefined' && loc === 'report_dashboard') {
-            var PieOptions = {
-                inGraphDataShow : true,
-                inGraphDataAnglePosition : 2,
-                inGraphDataRadiusPosition: 2,
-                inGraphDataRotate : "inRadiusAxisRotateLabels",
-                inGraphDataAlign : "center",
-                inGraphDataVAlign : "middle",
-                inGraphDataFontColor : "white",
-                inGraphDataFontSize : 14
-            };
-            var BarOptions = {barShowStroke: false};
-            var LineOptions = {};
-
-            var dealsByStagePie = document.getElementById("deal_stage").getContext("2d");
-            new Chart(dealsByStagePie).Pie(graphData.deal_stage, PieOptions);
-
-            var dealsByStatusPie = document.getElementById("deal_status").getContext("2d");
-            new Chart(dealsByStatusPie).Pie(graphData.deal_status, PieOptions);
-
-            //var yearlyCommissions = document.getElementById("yearly_commissions").getContext("2d");
-            //new Chart(yearlyCommissions).Line(graphData.yearly_commissions, LineOptions);
-
-            //var yearlyRevenue = document.getElementById("yearly_revenue").getContext("2d");
-            //new Chart(yearlyRevenue).Line(graphData.yearly_revenue, BarOptions);
-
-            var monthlyRevenue = document.getElementById("monthly_revenue").getContext("2d");
-            new Chart(monthlyRevenue).Bar(graphData.monthly_revenue, BarOptions);
-
-            //var monthlyCommissions = document.getElementById("monthly_commissions").getContext("2d");
-            //new Chart(monthlyCommissions).Bar(graphData.monthly_commissions, BarOptions);
+            CobaltChart.showChart('deal_stage',graphData.deal_stage,'pie');
+            CobaltChart.showChart('deal_status',graphData.deal_status,'pie');
+            CobaltChart.showChart('yearly_commissions',graphData.yearly_commissions,'bar');
+            CobaltChart.showChart('yearly_revenue',graphData.yearly_revenue,'bar');
+            CobaltChart.showChart('monthly_revenue',graphData.monthly_revenue,'bar');
+            CobaltChart.showChart('monthly_commissions',graphData.monthly_commissions,'bar');
         }
     },
 
@@ -817,7 +786,13 @@ var CobaltChart = {
             barShowStroke: false
         }
     },
+
     showChart: function (target, graph_data, chart_type) {
+        //default chart_type is bar
+        if (typeof chart_type == 'undefined') {
+            chart_type = 'bar';
+        }
+
         switch (chart_type) {
             case 'pie':
                 new Chart(document.getElementById(target).getContext("2d")).Pie(graph_data, this.Options.Pie);
@@ -826,6 +801,36 @@ var CobaltChart = {
                 new Chart(document.getElementById(target).getContext("2d")).Bar(graph_data, this.Options.Bar);
                 break;
         }
+    },
+
+    salesDashboardFilter: function(member,team){
+        var data = null;
+        var type = null;
+        //if we are searching for a specific member
+        if ( member != null ){
+            type = 'member_'+member;
+            data = 'filter=member&id='+member;
+        }
+        //if we are searching for a specific team
+        if ( team != null ){
+            type = 'team_'+team;
+            data = 'filter=team&id='+team;
+        }
+        //if we are searching for the company
+        if ( member == null && team == null ){
+            type = 'company';
+            data = 'filter=company';
+        }
+        jQuery.ajax({
+            type	:	'post',
+            url		:	'index.php?task=graph&format=raw&tmpl=component',
+            data	:	data,
+            dataType:	'json',
+            success	:	function(data){
+                graphData = data;
+                Cobalt.displayCharts();
+            }
+        });
     }
 };