diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php
index 97244efd3e7d..76344f431ecd 100644
--- a/resources/lang/en/texts.php
+++ b/resources/lang/en/texts.php
@@ -2465,6 +2465,9 @@ $LANG = array(
     'import_started' => 'Your import has started, we\'ll send you an email once it completes.',
     'listening' => 'Listening...',
     'microphone_help' => 'Say \'new invoice for...\'',
+    'voice_commands' => 'Voice Commands',
+    'sample_commands' => 'Sample commands',
+    'voice_commands_feedback' => 'We\'re actively working to improve this feature, if there\'s a command you\'d like us to support please email us at :email.',
 
 );
 
diff --git a/resources/views/header.blade.php b/resources/views/header.blade.php
index b5ce6d8e47ff..c129f445904c 100644
--- a/resources/views/header.blade.php
+++ b/resources/views/header.blade.php
@@ -398,7 +398,7 @@
                     <a href="{{ url(NINJA_FORUM_URL) }}" target="_blank" title="{{ trans('texts.support_forum') }}">
                         <i class="fa fa-list-ul"></i>
                     </a>
-                    <a href="javascript:showKeyboardShortcuts()" target="_blank" title="{{ trans('texts.keyboard_shortcuts') }}">
+                    <a href="javascript:showKeyboardShortcuts()" target="_blank" title="{{ trans('texts.help') }}">
                         <i class="fa fa-question-circle"></i>
                     </a>
                     <a href="{{ url(SOCIAL_LINK_FACEBOOK) }}" target="_blank" title="Facebook">
diff --git a/resources/views/partials/keyboard_shortcuts.blade.php b/resources/views/partials/keyboard_shortcuts.blade.php
index 5c5b00868604..6f37a8fd16b3 100644
--- a/resources/views/partials/keyboard_shortcuts.blade.php
+++ b/resources/views/partials/keyboard_shortcuts.blade.php
@@ -29,52 +29,95 @@
     <div class="modal-content">
       <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-        <h4 class="modal-title" id="myModalLabel">{{ trans('texts.keyboard_shortcuts') }}</h4>
+        <h4 class="modal-title" id="myModalLabel">{{ trans('texts.help') }}</h4>
       </div>
 
       <div class="container" style="width: 100%; padding-bottom: 0px !important">
       <div class="panel panel-default">
       <div class="panel-body help-panel">
-          <div class="row">
-              <div class="col-md-3"><div>?</div></div>
-              <div class="col-md-3 key-label">{{ trans('texts.help') }}</div>
-              <div class="col-md-3"><div>N</div><div>C</div></div>
-              <div class="col-md-3 key-label">{{ trans('texts.new_client') }}</div>
-          </div>
-          <div class="row">
-              <div class="col-md-3"><div>/</div></div>
-              <div class="col-md-3 key-label">{{ trans('texts.search') }}</div>
-              <div class="col-md-3"><div>N</div><div>I</div></div>
-              <div class="col-md-3 key-label">{{ trans('texts.new_invoice') }}</div>
-          </div>
-          <div class="row">
-              <div class="col-md-3"><div>M</div></div>
-              <div class="col-md-3 key-label">{{ trans('texts.menu') }}</div>
-              <div class="col-md-3"><div>N</div><div>...</div></div>
-              <div class="col-md-3 key-label">{{ trans('texts.new_...') }}</div>
-          </div>
-          <div class="row">
-              <div class="col-md-3"><div>H</div></div>
-              <div class="col-md-3 key-label">{{ trans('texts.history') }}</div>
-          </div>
-          <div class="row">
-              <div class="col-md-3"></div>
-              <div class="col-md-3"></div>
-              <div class="col-md-3"><div>L</div><div>C</div></div>
-              <div class="col-md-3 key-label">{{ trans('texts.list_clients') }}</div>
-          </div>
-          <div class="row">
-              <div class="col-md-3"><div>G</div><div>D</div></div>
-              <div class="col-md-3 key-label">{{ trans('texts.dashboard') }}</div>
-              <div class="col-md-3"><div>L</div><div>I</div></div>
-              <div class="col-md-3 key-label">{{ trans('texts.list_invoices') }}</div>
-          </div>
-          <div class="row">
-              <div class="col-md-3"><div>G</div><div>S</div></div>
-              <div class="col-md-3 key-label">{{ trans('texts.settings') }}</div>
-              <div class="col-md-3"><div>L</div><div>...</div></div>
-              <div class="col-md-3 key-label">{{ trans('texts.list_...') }}</div>
+
+          @if (Utils::isNinja() && Utils::isPro())
+              <div role="tabpanel">
+                  <ul class="nav nav-tabs" role="tablist" style="border: none">
+                      <li role="presentation" class="active">
+                          <a href="#keyboard_shortcuts" aria-controls="keyboard_shortcuts" role="tab" data-toggle="tab">{{ trans('texts.keyboard_shortcuts') }}</a>
+                      </li>
+                      <li role="presentation">
+                          <a href="#voice_commands" aria-controls="voice_commands" role="tab" data-toggle="tab">{{ trans('texts.voice_commands') }}</a>
+                      </li>
+                  </ul>
+              </div>
+              </br>
+          @endif
+
+          <div class="tab-content">
+              <div role="tabpanel" class="tab-pane active" id="keyboard_shortcuts">
+
+                  <div class="row">
+                      <div class="col-md-3"><div>?</div></div>
+                      <div class="col-md-3 key-label">{{ trans('texts.help') }}</div>
+                      <div class="col-md-3"><div>N</div><div>C</div></div>
+                      <div class="col-md-3 key-label">{{ trans('texts.new_client') }}</div>
+                  </div>
+                  <div class="row">
+                      <div class="col-md-3"><div>/</div></div>
+                      <div class="col-md-3 key-label">{{ trans('texts.search') }}</div>
+                      <div class="col-md-3"><div>N</div><div>I</div></div>
+                      <div class="col-md-3 key-label">{{ trans('texts.new_invoice') }}</div>
+                  </div>
+                  <div class="row">
+                      <div class="col-md-3"><div>M</div></div>
+                      <div class="col-md-3 key-label">{{ trans('texts.menu') }}</div>
+                      <div class="col-md-3"><div>N</div><div>...</div></div>
+                      <div class="col-md-3 key-label">{{ trans('texts.new_...') }}</div>
+                  </div>
+                  <div class="row">
+                      <div class="col-md-3"><div>H</div></div>
+                      <div class="col-md-3 key-label">{{ trans('texts.history') }}</div>
+                  </div>
+                  <div class="row">
+                      <div class="col-md-3"></div>
+                      <div class="col-md-3"></div>
+                      <div class="col-md-3"><div>L</div><div>C</div></div>
+                      <div class="col-md-3 key-label">{{ trans('texts.list_clients') }}</div>
+                  </div>
+                  <div class="row">
+                      <div class="col-md-3"><div>G</div><div>D</div></div>
+                      <div class="col-md-3 key-label">{{ trans('texts.dashboard') }}</div>
+                      <div class="col-md-3"><div>L</div><div>I</div></div>
+                      <div class="col-md-3 key-label">{{ trans('texts.list_invoices') }}</div>
+                  </div>
+                  <div class="row">
+                      <div class="col-md-3"><div>G</div><div>S</div></div>
+                      <div class="col-md-3 key-label">{{ trans('texts.settings') }}</div>
+                      <div class="col-md-3"><div>L</div><div>...</div></div>
+                      <div class="col-md-3 key-label">{{ trans('texts.list_...') }}</div>
+                  </div>
+
+              </div>
+
+              <div role="tabpanel" class="tab-pane" id="voice_commands">
+                  <div class="row">
+                      <p>
+                          {{ trans('texts.sample_commands') }}:
+                      </p>
+                      <p>
+                          <ul>
+                              <li>Go to the dashboard</li>
+                              <li>List active and deleted tasks</li>
+                              <li>Find &lt;client name&gt;</li>
+                              <li>Show me &lt;client name&gt;'s overdue invoices</li>
+                              <li>New invoice for &lt;client name&gt;</li>
+                              <li>Create payment for invoice &lt;invoice number&gt;</li>
+                          </ul>
+                      </p>
+                      <p>
+                          {!! trans('texts.voice_commands_feedback', ['email' => HTML::mailto(CONTACT_EMAIL)]) !!}
+                      </p>
+                  </div>
+              </div>
           </div>
+
       </div>
       </div>
       </div>
@@ -137,7 +180,7 @@
                 onMicrophoneClick();
             });
         @endif
-        
+
         @foreach([
             'i' => ENTITY_INVOICE,
             'p' => ENTITY_PAYMENT,
diff --git a/resources/views/partials/sign_up.blade.php b/resources/views/partials/sign_up.blade.php
index 3b0c0237e561..b09954a49755 100644
--- a/resources/views/partials/sign_up.blade.php
+++ b/resources/views/partials/sign_up.blade.php
@@ -228,7 +228,7 @@
                 {{ Former::setOption('TwitterBootstrap3.labelWidths.small', 4) }}
             </div>
 
-            <center><div id="errorTaken" style="display:none">&nbsp;<br/><b>{{ trans('texts.email_taken') }}<b></div></center>
+            <center><div id="errorTaken" style="display:none">&nbsp;<br/><b>{{ trans('texts.email_taken') }}</b></div></center>
 
             <div class="col-md-12">
                 @if (Auth::user()->registered)