diff --git a/framework/core/forms/controls/bootstrap3/ckeditorcontrol.php b/framework/core/forms/controls/bootstrap3/ckeditorcontrol.php
index 71684b781f..4ab49a75ab 100644
--- a/framework/core/forms/controls/bootstrap3/ckeditorcontrol.php
+++ b/framework/core/forms/controls/bootstrap3/ckeditorcontrol.php
@@ -171,7 +171,7 @@ function controlToHTML($name, $label) {
             $formattags = "'p;h1;h2;h3;h4;h5;h6;pre;address;div'";
         else
             $formattags = expString::check_javascript($formattags, true);  // $formattags must be enclosed in quotes '..'
-        if (empty($fontnames))
+        if (empty($fontnames)) {
             $fontnames = "'Arial/Arial, Helvetica, sans-serif;' +
                 'Comic Sans MS/Comic Sans MS, cursive;' +
                 'Courier New/Courier New, Courier, monospace;' +
@@ -181,8 +181,9 @@ function controlToHTML($name, $label) {
                 'Times New Roman/Times New Roman, Times, serif;' +
                 'Trebuchet MS/Trebuchet MS, Helvetica, sans-serif;' +
                 'Verdana/Verdana, Geneva, sans-serif'";
-        else
+        } else {
             $fontnames = expString::check_javascript($fontnames, true);  // $fontnames must be enclosed in quotes '..'
+        }
         $content = "
             $(document).ready(function(){
                 if(typeof(EXPONENT.editor" . createValidId($name) . ") !== 'undefined'){
diff --git a/framework/core/forms/controls/bootstrap3/tinymcecontrol.php b/framework/core/forms/controls/bootstrap3/tinymcecontrol.php
index 9643ab50ba..8ca9985224 100644
--- a/framework/core/forms/controls/bootstrap3/tinymcecontrol.php
+++ b/framework/core/forms/controls/bootstrap3/tinymcecontrol.php
@@ -77,7 +77,7 @@ function controlToHTML($name, $label)
                     ajax_action:'1',
                     json:'1'
                 },
-                upload_file_size	: '5mb',
+                upload_file_size	: '5mb',  //fixme
                 upload_callback		: function(res, file, up) {
                     if (res.status == 200) {
                         var response = JSON.parse(res.response);
@@ -92,11 +92,6 @@ function controlToHTML($name, $label)
                                     },
                 images_upload_url: '" . URL_FULL . "framework/modules/file/connector/uploader_paste_tinymce.php',
                 paste_data_images: true,";
-//            $upload .= "
-//            images_upload_url: '" . URL_FULL . "framework/modules/file/connector/uploader_tinymce.php',";
-//            $upload .= "
-//            paste_data_images: false,
-//            images_upload_base_path: '" . UPLOAD_DIRECTORY . "',";
         } else
             $upload = '';
         if (!empty($settings)) {
@@ -127,7 +122,7 @@ function controlToHTML($name, $label)
             $plugins = "advlist,autolink,lists,link,image,imagetools,charmap,print,preview,hr,anchor,pagebreak" .
                     ",searchreplace,wordcount,visualblocks,visualchars,code,fullscreen" .
                     ",media,nonbreaking,save,table,contextmenu,directionality" .
-                    ",emoticons,paste,textcolor,quickupload,localautosave";
+                    ",emoticons,paste,textcolor,quickupload,localautosave,help";
         }
         // clean up (custom) plugins list from missing plugins
         if (!empty($plugins)) {
@@ -146,7 +141,7 @@ function controlToHTML($name, $label)
             } else {
                 $tb = "
                 toolbar1: 'undo redo localautosave | styleselect formatselect fontselect fontsizeselect | cut copy paste | bold italic underline removeformat | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent',
-                toolbar2: 'link unlink image quickupload | print preview visualblocks fullscreen code media | forecolor backcolor emoticons";
+                toolbar2: 'link unlink image quickupload | print preview visualblocks fullscreen code media | forecolor backcolor emoticons help";
                 if (!empty($this->plugin)) {
                     $plugs = explode(',',trim($this->plugin));
                     $tb .= ' |';
@@ -209,14 +204,14 @@ classes: 'img-center'
                     },
                 ]},
             ";
-        } else
+        } else {
             $stylesset = expString::check_javascript($stylesset, false, true);  // $styleset must be enclosed in curly braces {..}
-
+        }
         if (empty($formattags))
             $formattags = "'Normal=p;Heading 1=h1;Heading 2=h2;Heading 3=h3;Heading 4=h4;Heading 5=h5;Heading 6=h6;Formatted=pre;Address=address;Normal (DIV)=div'";
         else
             $formattags = expString::check_javascript($formattags, true);  // $formattags must be enclosed in quotes '..'
-        if (empty($fontnames))
+        if (empty($fontnames)) {
             $fontnames = "'Andale Mono=andale mono,times;'+
                     'Arial=arial,helvetica,sans-serif;'+
                     'Arial Black=arial black,avant garde;'+
@@ -235,8 +230,9 @@ classes: 'img-center'
                     'Webdings=webdings;'+
                     'Wingdings=wingdings,zapf dingbats'
             ";
-        else
+        } else {
             $fontnames = expString::check_javascript($fontnames, true);  // $fontnames must be enclosed in quotes '..'
+        }
         $content = "
             $(document).ready(function(){
                 if(typeof(EXPONENT.editor" . createValidId($name) . ") !== 'undefined'){
diff --git a/framework/core/forms/controls/ckeditorcontrol.php b/framework/core/forms/controls/ckeditorcontrol.php
index ad7030b6ba..70dac71d5b 100644
--- a/framework/core/forms/controls/ckeditorcontrol.php
+++ b/framework/core/forms/controls/ckeditorcontrol.php
@@ -171,7 +171,7 @@ function controlToHTML($name, $label) {
             $formattags = "'p;h1;h2;h3;h4;h5;h6;pre;address;div'";
         else
             $formattags = expString::check_javascript($formattags, true);  // $formattags must be enclosed in quotes '..'
-        if (empty($fontnames))
+        if (empty($fontnames)) {
             $fontnames = "'Arial/Arial, Helvetica, sans-serif;' +
                 'Comic Sans MS/Comic Sans MS, cursive;' +
                 'Courier New/Courier New, Courier, monospace;' +
@@ -181,8 +181,9 @@ function controlToHTML($name, $label) {
                 'Times New Roman/Times New Roman, Times, serif;' +
                 'Trebuchet MS/Trebuchet MS, Helvetica, sans-serif;' +
                 'Verdana/Verdana, Geneva, sans-serif'";
-        else
+        } else {
             $fontnames = expString::check_javascript($fontnames, true);  // $fontnames must be enclosed in quotes '..'
+        }
         $content = "
         YUI(EXPONENT.YUI3_CONFIG).use('*', function(Y) {
             Y.Global.on(\"lazyload:cke\", function () {
diff --git a/framework/core/forms/controls/tinymcecontrol.php b/framework/core/forms/controls/tinymcecontrol.php
index d1bf39c98b..3b6a2b8772 100644
--- a/framework/core/forms/controls/tinymcecontrol.php
+++ b/framework/core/forms/controls/tinymcecontrol.php
@@ -92,11 +92,6 @@ function controlToHTML($name, $label)
                                     },
                 images_upload_url: '" . URL_FULL . "framework/modules/file/connector/uploader_paste_tinymce.php',
                 paste_data_images: true,";
-//            $upload .= "
-//            images_upload_url: '" . URL_FULL . "framework/modules/file/connector/uploader_tinymce.php',";
-//            $upload .= "
-//            paste_data_images: false,
-//            images_upload_base_path: '" . UPLOAD_DIRECTORY . "',";
         } else
             $upload = '';
         if (!empty($settings)) {
@@ -127,7 +122,7 @@ function controlToHTML($name, $label)
             $plugins = "advlist,autolink,lists,link,image,imagetools,charmap,print,preview,hr,anchor,pagebreak" .
                     ",searchreplace,wordcount,visualblocks,visualchars,code,fullscreen" .
                     ",media,nonbreaking,save,table,contextmenu,directionality" .
-                    ",emoticons,paste,textcolor,quickupload,localautosave";
+                    ",emoticons,paste,textcolor,quickupload,localautosave,help";
         }
         // clean up (custom) plugins list from missing plugins
         if (!empty($plugins)) {
@@ -146,7 +141,7 @@ function controlToHTML($name, $label)
             } else {
                 $tb = "
                 toolbar1: 'undo redo localautosave | styleselect formatselect fontselect fontsizeselect | cut copy paste | bold italic underline removeformat | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent',
-                toolbar2: 'link unlink image quickupload | print preview visualblocks fullscreen code media | forecolor backcolor emoticons";
+                toolbar2: 'link unlink image quickupload | print preview visualblocks fullscreen code media | forecolor backcolor emoticons help";
                 if (!empty($this->plugin)) {
                     $plugs = explode(',',trim($this->plugin));
                     $tb .= ' |';
@@ -209,14 +204,14 @@ classes: 'img-center'
                     },
                 ]},
             ";
-        } else
+        } else {
             $stylesset = expString::check_javascript($stylesset, false, true);  // $styleset must be enclosed in curly braces {..}
-
+        }
         if (empty($formattags))
             $formattags = "'Normal=p;Heading 1=h1;Heading 2=h2;Heading 3=h3;Heading 4=h4;Heading 5=h5;Heading 6=h6;Formatted=pre;Address=address;Normal (DIV)=div'";
         else
             $formattags = expString::check_javascript($formattags, true);  // $formattags must be enclosed in quotes '..'
-        if (empty($fontnames))
+        if (empty($fontnames)) {
             $fontnames = "'Andale Mono=andale mono,times;'+
                     'Arial=arial,helvetica,sans-serif;'+
                     'Arial Black=arial black,avant garde;'+
@@ -235,8 +230,9 @@ classes: 'img-center'
                     'Webdings=webdings;'+
                     'Wingdings=wingdings,zapf dingbats'
             ";
-        else
+        } else {
             $fontnames = expString::check_javascript($fontnames, true);  // $fontnames must be enclosed in quotes '..'
+        }
         $content = "
         YUI(EXPONENT.YUI3_CONFIG).use('*', function(Y) {
             Y.Global.on(\"lazyload:cke\", function () {
diff --git a/framework/modules/text/views/text/showall_inline.bootstrap.tpl b/framework/modules/text/views/text/showall_inline.bootstrap.tpl
index 085d014aaf..674bba4161 100644
--- a/framework/modules/text/views/text/showall_inline.bootstrap.tpl
+++ b/framework/modules/text/views/text/showall_inline.bootstrap.tpl
@@ -262,7 +262,7 @@
             } else {
                 mytoolbar = fullToolbar;
                 tinymenu = true;
-                tinyplugins = ['image,imagetools,searchreplace,contextmenu,paste,link,textcolor,visualblocks,code,localautosave'];
+                tinyplugins = ['image,imagetools,searchreplace,contextmenu,paste,link,textcolor,visualblocks,code,localautosave,help'];
             }
 
             {/literal}{if $smarty.const.SITE_WYSIWYG_EDITOR == "ckeditor"}{literal}
diff --git a/framework/modules/text/views/text/showall_inline.bootstrap3.tpl b/framework/modules/text/views/text/showall_inline.bootstrap3.tpl
index c9140d7b35..d6cbd2dfa1 100644
--- a/framework/modules/text/views/text/showall_inline.bootstrap3.tpl
+++ b/framework/modules/text/views/text/showall_inline.bootstrap3.tpl
@@ -270,7 +270,7 @@
             } else {
                 mytoolbar = fullToolbar;
                 tinymenu = true;
-                tinyplugins = ['image,imagetools,searchreplace,contextmenu,paste,link,textcolor,visualblocks,code,localautosave'];
+                tinyplugins = ['image,imagetools,searchreplace,contextmenu,paste,link,textcolor,visualblocks,code,localautosave,help'];
             }
 
             {/literal}{if $smarty.const.SITE_WYSIWYG_EDITOR == "ckeditor"}{literal}
diff --git a/framework/modules/text/views/text/showall_inline.tpl b/framework/modules/text/views/text/showall_inline.tpl
index 1d274c7ced..2bd4ee3816 100644
--- a/framework/modules/text/views/text/showall_inline.tpl
+++ b/framework/modules/text/views/text/showall_inline.tpl
@@ -252,7 +252,7 @@
             } else {
                 mytoolbar = fullToolbar;
                 tinymenu = true;
-                tinyplugins = ['image,imagetools,searchreplace,contextmenu,paste,link,textcolor,visualblocks,code,localautosave'];
+                tinyplugins = ['image,imagetools,searchreplace,contextmenu,paste,link,textcolor,visualblocks,code,localautosave,help'];
             }
 
             {/literal}{if $smarty.const.SITE_WYSIWYG_EDITOR == "ckeditor"}{literal}