diff --git a/app/lang/da/texts.php b/app/lang/da/texts.php
index 5f6f867cc4ab..f80e354f8326 100644
--- a/app/lang/da/texts.php
+++ b/app/lang/da/texts.php
@@ -566,6 +566,8 @@ return array(
   'password_error_incorrect' => 'The current password is incorrect.',
   'password_error_invalid' => 'The new password is invalid.',
   'updated_password' => 'Successfully updated password',
-  
 
+  'api_tokens' => 'API Tokens',
+  'users_and_tokens' => 'Users & Tokens',
+  
 );
diff --git a/app/lang/de/texts.php b/app/lang/de/texts.php
index d75323867887..bd682f3150c8 100644
--- a/app/lang/de/texts.php
+++ b/app/lang/de/texts.php
@@ -557,6 +557,9 @@ return array(
   'password_error_incorrect' => 'Das aktuelle Passwort ist nicht korrekt.',
   'password_error_invalid' => 'Das neue Kennwort ist ungültig.',
   'updated_password' => 'Passwort erfolgreich aktualisiert',
-  
+
+  'api_tokens' => 'API Tokens',
+  'users_and_tokens' => 'Users & Tokens',
+
 
 );
diff --git a/app/lang/en/texts.php b/app/lang/en/texts.php
index 7d06c89a6f4e..c14670739451 100644
--- a/app/lang/en/texts.php
+++ b/app/lang/en/texts.php
@@ -565,4 +565,8 @@ return array(
   'password_error_invalid' => 'The new password is invalid.',
   'updated_password' => 'Successfully updated password',
 
+  'api_tokens' => 'API Tokens',
+  'users_and_tokens' => 'Users & Tokens',
+  
+  
 );
diff --git a/app/lang/es/texts.php b/app/lang/es/texts.php
index f400c21b21bd..a540e47e39ca 100644
--- a/app/lang/es/texts.php
+++ b/app/lang/es/texts.php
@@ -537,5 +537,8 @@ return array(
   'password_error_invalid' => 'The new password is invalid.',
   'updated_password' => 'Successfully updated password',
 
+  'api_tokens' => 'API Tokens',
+  'users_and_tokens' => 'Users & Tokens',
+
 
 );
\ No newline at end of file
diff --git a/app/lang/fr/texts.php b/app/lang/fr/texts.php
index 36ca7b9c7311..e304cad8b6c0 100644
--- a/app/lang/fr/texts.php
+++ b/app/lang/fr/texts.php
@@ -558,5 +558,8 @@ return array(
   'password_error_invalid' => 'The new password is invalid.',
   'updated_password' => 'Successfully updated password',
 
+  'api_tokens' => 'API Tokens',
+  'users_and_tokens' => 'Users & Tokens',
+
 
 );
\ No newline at end of file
diff --git a/app/lang/it/texts.php b/app/lang/it/texts.php
index b3772a45764d..e4dcb5e926bc 100644
--- a/app/lang/it/texts.php
+++ b/app/lang/it/texts.php
@@ -560,5 +560,8 @@ return array(
   'password_error_invalid' => 'The new password is invalid.',
   'updated_password' => 'Successfully updated password',
 
+  'api_tokens' => 'API Tokens',
+  'users_and_tokens' => 'Users & Tokens',
+
     
 );
diff --git a/app/lang/lt/texts.php b/app/lang/lt/texts.php
index d144838b8ddd..943194ac8672 100644
--- a/app/lang/lt/texts.php
+++ b/app/lang/lt/texts.php
@@ -568,6 +568,9 @@ return array(
   'password_error_invalid' => 'The new password is invalid.',
   'updated_password' => 'Successfully updated password',
 
+  'api_tokens' => 'API Tokens',
+  'users_and_tokens' => 'Users & Tokens',
+
     
 );
 
diff --git a/app/lang/nb_NO/texts.php b/app/lang/nb_NO/texts.php
index e1efa117ccae..80d4b6cc58ce 100644
--- a/app/lang/nb_NO/texts.php
+++ b/app/lang/nb_NO/texts.php
@@ -566,5 +566,8 @@ return array(
   'password_error_invalid' => 'The new password is invalid.',
   'updated_password' => 'Successfully updated password',
 
+  'api_tokens' => 'API Tokens',
+  'users_and_tokens' => 'Users & Tokens',
+
   
 );
\ No newline at end of file
diff --git a/app/lang/nl/texts.php b/app/lang/nl/texts.php
index d4d233db6248..8cb6331b7e1f 100644
--- a/app/lang/nl/texts.php
+++ b/app/lang/nl/texts.php
@@ -561,6 +561,9 @@ return array(
   'password_error_invalid' => 'The new password is invalid.',
   'updated_password' => 'Successfully updated password',
 
+  'api_tokens' => 'API Tokens',
+  'users_and_tokens' => 'Users & Tokens',
+
 
   
 );
\ No newline at end of file
diff --git a/app/lang/pt_BR/texts.php b/app/lang/pt_BR/texts.php
index 9fcd74d41adc..28ac859e91f1 100644
--- a/app/lang/pt_BR/texts.php
+++ b/app/lang/pt_BR/texts.php
@@ -549,5 +549,8 @@ return array(
   'password_error_invalid' => 'The new password is invalid.',
   'updated_password' => 'Successfully updated password',
 
+  'api_tokens' => 'API Tokens',
+  'users_and_tokens' => 'Users & Tokens',
+
   
 );
diff --git a/app/views/accounts/nav_advanced.blade.php b/app/views/accounts/nav_advanced.blade.php
index 7c344f575419..3f0d62789ca5 100644
--- a/app/views/accounts/nav_advanced.blade.php
+++ b/app/views/accounts/nav_advanced.blade.php
@@ -2,20 +2,16 @@
   {{ HTML::nav_link('company/advanced_settings/invoice_settings', 'invoice_settings') }}
   {{ HTML::nav_link('company/advanced_settings/invoice_design', 'invoice_design') }}
   {{ HTML::nav_link('company/advanced_settings/email_templates', 'email_templates') }}
-  {{ HTML::nav_link('company/advanced_settings/data_visualizations', 'data_visualizations') }}
   {{ HTML::nav_link('company/advanced_settings/chart_builder', 'chart_builder') }}
-  {{ HTML::nav_link('company/advanced_settings/user_management', 'users', 'users') }}
-  {{ HTML::nav_link('company/advanced_settings/token_management', 'tokens', 'tokens') }}
+  {{ HTML::nav_link('company/advanced_settings/user_management', 'users_and_tokens') }}
 </ul>
 <p>&nbsp;</p>
 
 @if (!Auth::user()->account->isPro())
-<div class="container">
-  <div class="row">
+<center>
     <div style="font-size:larger;" class="col-md-8 col-md-offset-2">{{ trans('texts.pro_plan_advanced_settings', ['link'=>'<a href="#" onclick="showProPlan(\''.$feature.'\')">'.trans('texts.pro_plan.remove_logo_link').'</a>']) }}</div>
     &nbsp;<p/>&nbsp;
-  </div>    
-</div>
+</center>    
 @endif
 
 <br/>
\ No newline at end of file
diff --git a/app/views/accounts/user_management.blade.php b/app/views/accounts/user_management.blade.php
index 8a1a66df9b46..c0e8e2819e8e 100644
--- a/app/views/accounts/user_management.blade.php
+++ b/app/views/accounts/user_management.blade.php
@@ -13,9 +13,12 @@
   {{ Former::close() }}
 
 
-  @if (Utils::isPro())
-    {{ Button::success_link(URL::to('users/create'), trans("texts.add_user"), array('class' => 'pull-right'))->append_with_icon('plus-sign') }}
-  @endif
+  <div class="pull-right">  
+    @if (Utils::isPro())    
+        {{ Button::success_link(URL::to('users/create'), trans("texts.add_user"))->append_with_icon('plus-sign') }}
+    @endif
+    {{ Button::default_link(URL::to('company/advanced_settings/token_management'), trans("texts.api_tokens"))->append_with_icon('cloud') }}
+  </div>
 
 
     <label for="trashed" style="font-weight:normal; margin-left: 10px;">
diff --git a/app/views/reports/report_builder.blade.php b/app/views/reports/report_builder.blade.php
index 96cb4702cb20..e45e96063b03 100755
--- a/app/views/reports/report_builder.blade.php
+++ b/app/views/reports/report_builder.blade.php
@@ -10,9 +10,13 @@
 	@parent
 	@include('accounts.nav_advanced')
 
-  {{ Former::open() }}
-  {{ Former::legend('chart_builder') }}
-  {{ Former::close() }}
+
+    <legend style="padding-bottom:32px">
+        {{ trans('texts.chart_builder') }}
+        <div class="pull-right">
+           {{ Button::default_link(URL::to('company/advanced_settings/data_visualizations'), trans("texts.data_visualizations"))->append_with_icon('globe') }}
+        </div>
+    </legend>
 
 	<div class="row">
 		<div class="col-lg-4">