diff --git a/control/content/index.html b/control/content/index.html
index bb80245..302acb6 100644
--- a/control/content/index.html
+++ b/control/content/index.html
@@ -36,7 +36,7 @@
         <hr class="none">
         <div class="item clearfix row">
             <div class="main col-md-12 pull-left">
-                <textarea id="text" ui-tinymce class="form-control" rows="5" width="100%" ng-model="data.content.text"></textarea>
+                <textarea id="text" ui-tinymce="editorOptions" class="form-control" rows="5" width="100%" ng-model="data.content.text"></textarea>
             </div>
         </div>
 
@@ -48,6 +48,13 @@
         var folderPluginApp = angular.module('folderPlugin', ['ui.tinymce']);
 
         folderPluginApp.controller('folderPluginCtrl', ['$scope', function ($scope) {
+            $scope.editorOptions = {
+                plugins: 'advlist autolink link image lists charmap print preview',
+                skin: 'lightgray',
+                trusted: true,
+                theme: 'modern'                
+            };
+
             // create a new instance of the buildfire carousel editor
             var editor = new buildfire.components.carousel.editor("#carousel");
             var plugins = new buildfire.components.pluginInstance.sortableList("#plugins", []);
diff --git a/widget/index.html b/widget/index.html
index df067f6..4d4a2fd 100644
--- a/widget/index.html
+++ b/widget/index.html
@@ -31,6 +31,10 @@
             .overlay.background img {
                 height: 100%;
             }
+
+        .layout-6 .list-item-media {
+            background-color: transparent !important;
+        }
     </style>
     <div class="overlay background" ng-if="data.design.backgroundImage && deviceWidth != 0 && deviceHeight != 0">
         <img ng-src="{{ cropImage(data.design.backgroundImage, {width: deviceWidth, height: deviceHeight}) }}"
diff --git a/widget/templates/layout4.html b/widget/templates/layout4.html
index 8f18332..27315ed 100644
--- a/widget/templates/layout4.html
+++ b/widget/templates/layout4.html
@@ -3,6 +3,6 @@
         <img ng-src="{{ cropImage(plugin.iconUrl? plugin.iconUrl : 'http://www.placehold.it/450x254', {width: 450, height: 254}) }}">
     </div>
     <div class="info-bar bg-primary">
-        <p class="margin-bottom-zero col-md-12 ellipsis">{{ plugin.title }}</p>
+        <p class="margin-bottom-zero col-md-12 ellipsis titleBarTextAndIcons">{{ plugin.title }}</p>
     </div>
 </div>
diff --git a/widget/templates/layout5.html b/widget/templates/layout5.html
index 9995d76..74764d9 100644
--- a/widget/templates/layout5.html
+++ b/widget/templates/layout5.html
@@ -7,7 +7,7 @@
                         <img ng-src="{{ cropImage(plugin.iconUrl? plugin.iconUrl : 'http://www.placehold.it/200x200', {width: 200, height: 200}) }}">
                     </div>
                     <div class="info-bar bg-primary">
-                        <p class="margin-bottom-zero col-md-12 ellipsis">
+                        <p class="margin-bottom-zero col-md-12 ellipsis titleBarTextAndIcons">
                             {{ plugin.title }}
                         </p>
                     </div>
diff --git a/widget/templates/layout6.html b/widget/templates/layout6.html
index 780832d..e31972c 100644
--- a/widget/templates/layout6.html
+++ b/widget/templates/layout6.html
@@ -1,13 +1,13 @@
 <div class="padded padding-top-zero">
-    <div class="list-layout">
+    <div class="list-layout layout-6">
         <div ng-repeat="pluginRow in data.plugins" class="row">
             <div class="list-item col-xs-6 pull-left" ng-repeat="plugin in pluginRow" ng-click="navigateToPlugin(plugin)">
                 <div class="list-item-media text-center border-radius-three overflow-hidden">
                     <div class="list-media-holder">
                         <img ng-src="{{ cropImage(plugin.iconUrl? plugin.iconUrl : 'http://www.placehold.it/200x200', {width: 200, height: 200}) }}">
                     </div>
-                    <div class="list-item-copy text-left">
-                        <p cclass="ellipsis margin-zero text-primary text-center">
+                    <div class="list-item-copy text-center" style="min-height: 42px;">
+                        <p cclass="ellipsis margin-zero text-primary">
                             <a class="text-primary">
                                 {{ plugin.title }}
                             </a>