diff --git a/components/resources/resources-portal/src/main/resources/META-INF/dirigible/portal/ui/launchpad/Home/controller.js b/components/resources/resources-portal/src/main/resources/META-INF/dirigible/portal/ui/launchpad/Home/controller.js
index 28bdfdb34f..32cf1aa9c2 100644
--- a/components/resources/resources-portal/src/main/resources/META-INF/dirigible/portal/ui/launchpad/Home/controller.js
+++ b/components/resources/resources-portal/src/main/resources/META-INF/dirigible/portal/ui/launchpad/Home/controller.js
@@ -34,6 +34,14 @@ angular.module('page', ["ideUI", "ideView", "entityApi"])
 				messageHub.showAlertError("Home", `Unable to get Home Launchpad: '${response.message}'`);
 				return;
 			}
-			$scope.data = response.data;
+			$scope.groups = response.data;
+
+			$scope.groups = $scope.groups.filter(group => (group.name !== 'Reports'));
+			$scope.groups = $scope.groups.sort((a, b) => a.name.localeCompare(b.name));
+			$scope.settings = [];
+			$scope.groups.forEach(group => group.tiles.forEach(tile => $scope.settings.push(tile)));
+			$scope.settings = $scope.settings.filter(tile => tile.type === 'SETTING');
+			$scope.settings = $scope.settings.sort((a, b) => a.name.localeCompare(b.name));
+			$scope.groups = $scope.groups.filter(group => (group.tiles.filter(tile => tile.type === 'PRIMARY')).length > 0);
 		});
 	}]);
diff --git a/components/resources/resources-portal/src/main/resources/META-INF/dirigible/portal/ui/launchpad/Home/index.html b/components/resources/resources-portal/src/main/resources/META-INF/dirigible/portal/ui/launchpad/Home/index.html
index 96adc4c26f..50d8811e7c 100644
--- a/components/resources/resources-portal/src/main/resources/META-INF/dirigible/portal/ui/launchpad/Home/index.html
+++ b/components/resources/resources-portal/src/main/resources/META-INF/dirigible/portal/ui/launchpad/Home/index.html
@@ -39,13 +39,13 @@ <h3 class="fd-section__title">Applications Portal</h3>
 				<p class="fd-text">All the products available on this instance are listed below</p>
 				<br>
 
+				<div class="fd-row">
 
-				<div class="fd-panel fd-panel--fixed">
-					<div class="fd-container">
+					<div class="fd-container fd-col fd-col--10">
 
-						<div class="fd-row" ng-repeat="group in data">
+						<div ng-repeat="group in groups">
 
-							<fd-panel expanded="false">
+							<fd-panel expanded="true">
 
 								<fd-panel-header>
 									<fd-panel-expand></fd-panel-expand>
@@ -54,10 +54,9 @@ <h4 fd-panel-title>{{group.name}}</h4>
 
 								<fd-panel-content aria-label="{{group.name}} Content">
 									<div class="fd-row">
-										<div class="fd-col fd-col--6 fd-col-md--6 fd-col-lg--6 fd-col-xl--6">
-											<div class="fd-row">
-												<div class="fd-col fd-col--12 fd-col-md--12 fd-col-lg--12 fd-col-xl--12"
-													ng-repeat="next in group.tiles" ng-if="next.type==='PRIMARY'">
+										<div>
+											<div>
+												<div ng-repeat="next in group.tiles" ng-if="next.type==='PRIMARY'">
 													<div>
 														<fd-card card-type="object">
 															<fd-card-header ng-click="openView(next.location)">
@@ -73,7 +72,7 @@ <h4 fd-panel-title>{{group.name}}</h4>
 											</div>
 										</div>
 
-										<div class="fd-col fd-col--6 fd-col-md--6 fd-col-lg--6 fd-col-xl--6">
+										<div>
 
 
 
@@ -95,8 +94,8 @@ <h4 fd-panel-title>{{group.name}}</h4>
 
 
 									</div>
-
-									<div class="fd-col fd-col--12 fd-col-md--12 fd-col-lg--12 fd-col-xl--12">
+									<!--
+									<div>
 										<div class="fd-toolbar" role="toolbar">
 											<div ng-repeat="next in group.tiles" ng-if="next.type==='SETTING'">
 												<button fd-button-internal="" class="fd-button fd-button--compact"
@@ -110,11 +109,50 @@ <h4 fd-panel-title>{{group.name}}</h4>
 												class="fd-toolbar__spacer"></div>
 										</div>
 									</div>
+									-->
+
+
 								</fd-panel-content>
 							</fd-panel>
 						</div>
 
 					</div>
+
+
+					<div class="fd-container fd-col fd-col--2">
+
+						<fd-panel expanded="true">
+
+							<fd-panel-header>
+								<fd-panel-expand></fd-panel-expand>
+								<h4 fd-panel-title>Settings</h4>
+							</fd-panel-header>
+
+							<fd-panel-content aria-label="{{group.name}} Content">
+
+								<div>
+
+									<div>
+										<div>
+											<div ng-repeat="next in settings">
+												<button fd-button-internal="" class="fd-button fd-button--compact"
+													compact="true" dg-label="{{next.name}}" style="width: 100%;"
+													ng-click="openView(next.location)">
+
+													<span ng-class="getTextClasses()"
+														class="fd-button__text">{{next.name}}</span>
+											</div>
+											<div ng-class="getClasses()" ng-style="getStyles()" ng-transclude=""
+												class="fd-toolbar__spacer"></div>
+										</div>
+									</div>
+								</div>
+							</fd-panel-content>
+						</fd-panel>
+
+
+					</div>
+
 				</div>