diff --git a/grails-app/assets/javascripts/streama/templates/settings-settings.tpl.htm b/grails-app/assets/javascripts/streama/templates/settings-settings.tpl.htm
index a4d3618f4..971e6d5bc 100644
--- a/grails-app/assets/javascripts/streama/templates/settings-settings.tpl.htm
+++ b/grails-app/assets/javascripts/streama/templates/settings-settings.tpl.htm
@@ -77,5 +77,6 @@ <h1>
 
 <hr/>
 
+<button class="btn btn-primary pull-right" ng-click="updateMultipleSettings(settings)" ng-disabled="anySettingsInvalid()">Save Settings</button>
 
 
diff --git a/grails-app/services/streama/DefaultDataService.groovy b/grails-app/services/streama/DefaultDataService.groovy
index 69b967a89..2989df33e 100644
--- a/grails-app/services/streama/DefaultDataService.groovy
+++ b/grails-app/services/streama/DefaultDataService.groovy
@@ -197,6 +197,15 @@ class DefaultDataService {
             required: false,
             validationRequired: false
         ],
+		[
+            settingsKey: 'Hide Help/FAQ section',
+            name: 'hide_help_faq',
+            description: 'Determines whether the help/faq section should be displayed for the users',
+            settingsType: 'boolean',
+            value: 'false',
+            required: false,
+            validationRequired: false
+        ],
 //        [
 //            settingsKey: 'Remove Source After Convert',
 //            value: 'yes',
diff --git a/grails-app/views/layouts/main.gsp b/grails-app/views/layouts/main.gsp
index 7a3331fb8..32f384b7c 100644
--- a/grails-app/views/layouts/main.gsp
+++ b/grails-app/views/layouts/main.gsp
@@ -85,6 +85,7 @@
 							</button>
 							<ul class="dropdown-menu dropdown-menu-right"
 									uib-dropdown-menu role="menu" aria-labelledby="single-button">
+                <li>{{$root.settings}}</li>
 								<li role="menuitem"><a ui-sref="help">{{'HELP_FAQ' | translate}}</a></li>
 								<li role="menuitem"><a ui-sref="userSettings">{{'PROFILE_SETTINGS' | translate}}</a></li>
 								<li class="divider"></li>
diff --git a/grails-app/views/templates/_header.gsp b/grails-app/views/templates/_header.gsp
index 39d762acb..ab56cdd3d 100644
--- a/grails-app/views/templates/_header.gsp
+++ b/grails-app/views/templates/_header.gsp
@@ -97,7 +97,7 @@
                 <a ui-sref="sub-profiles">{{'MANAGE_SUB_PROFILES' | translate}}</a>
               </li>
               <li class="divider"></li>
-              <li role="menuitem"><a ui-sref="help">{{'HELP_FAQ' | translate}}</a></li>
+              <li ng-if="!$root.getSetting('hide_help_faq').parsedValue" role="menuitem"><a ui-sref="help">{{'HELP_FAQ' | translate}}</a></li>
               <li role="menuitem"><a ui-sref="userSettings">{{'PROFILE_SETTINGS' | translate}}</a></li>
               <li class="divider"></li>
               <li><g:link uri="/logoff">{{'LOGOUT' | translate}}</g:link></li>