diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/bulletin-board/bulletin-board-content.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/bulletin-board/bulletin-board-content.jsp
index cdfe10239e..39fa055a79 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/bulletin-board/bulletin-board-content.jsp
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/bulletin-board/bulletin-board-content.jsp
@@ -18,7 +18,7 @@
 <div id="bulletin-board">
     <div id="bulletin-board-header-and-filter">
         <div id="bulletin-board-header-text">NiFi Templates</div>
-        <div id="bulletin-board-filter-controls" class="filter-controls">
+        <div id="bulletin-board-filter-controls">
             <div id="bulletin-board-filter-container" class="filter-container">
                 <input type="text" placeholder="Filter" id="bulletin-board-filter" class="filter"/>
                 <div id="bulletin-board-filter-type" class="filter-type"></div>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/counters/counters-content.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/counters/counters-content.jsp
index 0472332746..22f686fb00 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/counters/counters-content.jsp
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/counters/counters-content.jsp
@@ -18,7 +18,7 @@
 <div id="counters">
     <div id="counters-header-and-filter">
         <div id="counters-header-text">NiFi Counters</div>
-        <div id="counters-filter-controls" class="filter-controls">
+        <div id="counters-filter-controls">
             <div id="counters-filter-stats" class="filter-status">
                 Displaying&nbsp;<span id="displayed-counters"></span>&nbsp;of&nbsp;<span id="total-counters"></span>
             </div>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/templates/templates-content.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/templates/templates-content.jsp
index 00b4e5e382..19b1f67bfd 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/templates/templates-content.jsp
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/templates/templates-content.jsp
@@ -20,7 +20,7 @@
     <span id="template-group-id" class="hidden"><c:out value="${param.groupId}"/></span>
     <div id="templates-header-and-filter">
         <div id="templates-header-text">NiFi Templates</div>
-        <div id="templates-filter-controls" class="filter-controls">
+        <div id="templates-filter-controls">
             <div id="templates-filter-stats" class="filter-status">
                 Displaying&nbsp;<span id="displayed-templates"></span>&nbsp;of&nbsp;<span id="total-templates"></span>
             </div>
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/bulletin-board.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/bulletin-board.css
index a43de40b33..afa8af8588 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/bulletin-board.css
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/bulletin-board.css
@@ -19,7 +19,13 @@
 */
 
 #bulletin-board {
-    margin: 20px;
+    position: absolute;
+    top: 0px;
+    bottom: 0px;
+    left: 20px;
+    right: 20px;
+    height: 100%;
+    overflow: auto;
 }
 
 #bulletin-board-header-text {
@@ -32,10 +38,9 @@
 
 #bulletin-board-refresh-container {
     position: absolute;
-    right: 0px;
-    bottom: 20px;
-    margin: 20px;
-    left: 0px;
+    right: 20px;
+    bottom: 0px;
+    left: 20px;
 }
 
 #bulletin-board-loading-container {
@@ -79,6 +84,7 @@
 #bulletin-board-container {
     overflow-y: auto;
     width: 100%;
+    padding-top: 20px;
 }
 
 div.bulletin-action {
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/component-state.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/component-state.css
index ee4407da5e..99b427e2fd 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/component-state.css
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/component-state.css
@@ -43,20 +43,25 @@
 #component-state-table {
     overflow: hidden;
     position: absolute;
-    top: 142px;
+    top: 202px;
     left: 0px;
     right: 0px;
     bottom: 0px;
     min-height: 150px;
 }
 
+#component-state-description{
+    height: 75px;
+    overflow: auto;
+}
+
 /*
     Clear
 */
 
 #clear-link-container {
     position: absolute;
-    top: 120px;
+    top: 180px;
     right: 20px;
 }
 
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/templates.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/templates.css
index a7a980bba1..2893d8aff1 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/templates.css
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/templates.css
@@ -66,10 +66,6 @@
 
 /* filter controls */
 
-#templates-filter-controls {
-    float: right;
-}
-
 #templates-filter-container {
     height: 32px;
     width: 318px;
@@ -94,7 +90,7 @@ input.templates-filter-list {
 
 #templates-table {
     position: absolute;
-    top: 108px;
+    top: 98px;
     left: 0px;
     bottom: 47px;
     right: 0px;
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.js
index 122e998114..5b48a65c80 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.js
@@ -1219,9 +1219,15 @@
                 var controllerService = controllerServiceEntity.component;
                 $.Deferred(function (deferred) {
                     if (nf.Common.isDefinedAndNotNull(controllerService.parentGroupId)) {
-                        nf.ProcessGroupConfiguration.showConfiguration(controllerService.parentGroupId).done(function () {
-                            deferred.resolve();
-                        });
+                        if ($('#process-group-configuration').is(':visible')) {
+                            nf.ProcessGroupConfiguration.loadConfiguration(controllerService.parentGroupId).done(function () {
+                                deferred.resolve();
+                            });
+                        } else {
+                            nf.ProcessGroupConfiguration.showConfiguration(controllerService.parentGroupId).done(function () {
+                                deferred.resolve();
+                            });
+                        }
                     } else {
                         if ($('#settings').is(':visible')) {
                             // reload the settings
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/bulletin-board/nf-bulletin-board.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/bulletin-board/nf-bulletin-board.js
index be8f2d6b99..52c7a03a86 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/bulletin-board/nf-bulletin-board.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/bulletin-board/nf-bulletin-board.js
@@ -286,7 +286,8 @@ nf.ng.BulletinBoardCtrl = function (serviceProvider) {
                     "position": "absolute",
                     "width": "100%",
                     "bottom": "40px",
-                    "margin": "40px"
+                    "left": "40px",
+                    "right": "40px"
                 });
 
                 $('#bulletin-board-status-container').css({
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group-configuration.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group-configuration.js
index 790c9f53c2..26d253dc3a 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group-configuration.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group-configuration.js
@@ -265,6 +265,15 @@ nf.ProcessGroupConfiguration = (function () {
             return loadConfiguration(groupId).done(showConfiguration);
         },
 
+        /**
+         * Loads the configuration for the specified process group.
+         *
+         * @param groupId
+         */
+        loadConfiguration: function (groupId) {
+            return loadConfiguration(groupId);
+        },
+
         /**
          * Selects the specified controller service.
          *