diff --git a/src/main/webapp/app/home/home.component.html b/src/main/webapp/app/home/home.component.html
index 0c75d8d..bbdbe77 100644
--- a/src/main/webapp/app/home/home.component.html
+++ b/src/main/webapp/app/home/home.component.html
@@ -4,33 +4,20 @@
 		<div *ngIf="isLoading" class="loader-container">
 			<mat-spinner mode="indeterminate" style="top: 50%; left: 50%;"></mat-spinner>
 		</div>
-		<div class="d-flex flex-row py-4">
-		  <div id="btn-group" class="col-md-3">
+		<div class="d-flex flex-row py-4"> <!-- top row with buttons and select-->
+		  <div id="btn-group" class="col-md-3 py-3">
 		    <button mat-raised-button color="primary"><mat-icon>source</mat-icon> <span>File</span></button>
 		    <button mat-raised-button color="primary"><mat-icon>edit</mat-icon> <span>Edit</span></button>
 		    <button mat-raised-button color="primary"><mat-icon>explore</mat-icon> <span>View</span></button>
 		    <button mat-raised-button color="primary"><mat-icon>help</mat-icon><span>Help</span></button>
-		    
-		    
-		    <div id="restree" class="m-3 p-4 border border-1 rounded-4" >
-					<h4>Resource Types</h4>
-				    <div class="col-md-3" id="tree-view">
-						<jhi-rsc-tree id="leftTree" (typeObjectEm)="buildTableData($event)"></jhi-rsc-tree>    
-					</div>
-			</div>
-			
-		  </div>
-			
-			<div class="col-md-9">
-				<!-- <h2 #titleRoot *ngIf="allCtxs && allCtxs.length!==0" class="pt-3">Root Context: {{[allCtxs[0].path]}} - UUID: {{allCtxs[0].id}}</h2> -->
-			<div>
-				<div ngbDropdown #myDrop="ngbDropdown" ></div>
+		    </div>
+		    <div id="context-block" class="col-md-9 px-4">
+		    	 <div ngbDropdown #myDrop="ngbDropdown" ></div>
 				 <form [formGroup]="chooseContextForm">
-					 <div class="my-3">
-						 
-					<mat-form-field id="pathfield"  [style.width.px]="400" class="form-field">
+				  <div >
+					<mat-form-field id="pathfield"  [style.width.px]="200" class="form-field">
 						
-						<mat-select  placeholder="Available Contexts" formControlName="pathfield" (valueChange)="setNewContext($event)">
+						<mat-select  placeholder="Contexts" formControlName="pathfield" (valueChange)="setNewContext($event)">
 							<mat-select-filter [placeholder]="'filter by name'" [displayMember]="'path'" [array]="allCtxs" (filteredReturn)="filteredContexts =$event"></mat-select-filter>
 								<mat-option *ngFor="let item of filteredContexts" [value]="item">
 									{{item.path}}
@@ -40,15 +27,14 @@
 						<button mat-button (click)="copyPath(pathfield)" color="primary" matTooltip="copy path" matTooltipPosition="below">
 							<mat-icon class="icon-wide2">content_copy</mat-icon>
 						</button>
-					 </div>
 					 
-						<mat-form-field id="namefield" [style.width.px]=400 appearance="outline" class="form-field">
+						<mat-form-field id="namefield" [style.width.px]=300 appearance="outline" class="form-field">
 							<mat-label for="namefield">Context Name</mat-label>
 							<input matInput type="text" placeholder="Name" 
 							formControlName="namefield" readonly [value]="pathfield.value.name" />
 						</mat-form-field>
 						
-						<mat-form-field id="uidfield" [style.width.px]=400 appearance="outline" class="form-field">
+						<mat-form-field id="uidfield" [style.width.px]=350 appearance="outline" class="form-field">
 							<mat-label for="uidfield">Context UUID</mat-label>
 							<input matInput type="text" placeholder="UUID" 
 							formControlName="uidfield" readonly [value]="pathfield.value.id" />
@@ -59,9 +45,21 @@
 						<button mat-button  color="primary" matTooltip="locate" matTooltipPosition="below">
 								<mat-icon class="icon-wide2">location_searching</mat-icon>
 						</button>
-						
+						 </div>
 					</form>
-						  <div [ngSwitch]="resType.name" class="mt-3">
+		  	</div>
+		  	</div>
+		  
+		  <div class="d-flex flex-row">
+		    <div id="restree" class="col-md-3 ps-3 pt-3 border border-1 rounded-4" >
+					<h4>Resource Types</h4>
+				    <div id="tree-view">
+						<jhi-rsc-tree id="leftTree" (typeObjectEm)="buildTableData($event)"></jhi-rsc-tree>    
+					</div>
+			</div>
+			
+			<div class="col-md-9 ">
+						  <div [ngSwitch]="resType.name" >
 							<div *ngSwitchCase = "'HostingNode'">
 								<jhi-table-screen [typeObject]="resType" [currentCtx]="myContext"></jhi-table-screen>
 							</div>
@@ -70,8 +68,8 @@
 							</div>
 						  	<div *ngSwitchDefault>Qui mettere Tipo e bottone per aggiungere</div>
 						  </div>
-					</div>
-				</div>
+					
+			</div>
 			</div>	
 	  </div><!-- end successful login -->
 	  <div class="alert alert-warning" *ngSwitchCase="false">
diff --git a/src/main/webapp/app/table-screen-es/table-screen-es.component.html b/src/main/webapp/app/table-screen-es/table-screen-es.component.html
index 7b65ea7..c426e64 100644
--- a/src/main/webapp/app/table-screen-es/table-screen-es.component.html
+++ b/src/main/webapp/app/table-screen-es/table-screen-es.component.html
@@ -2,25 +2,27 @@
 	
 	<!--<h4>Type: {{resourceType}} ({{currentCtx.name}})</h4>-->
 <div class="d-flex flex-row mb-4">
-	<h4 class="font-weight-bold" >Type: {{typeObject.name}}</h4>
-		<button mat-button  color="primary" matTooltip="open description" matTooltipPosition="right">
-					<mat-icon class="icon-infodescr" (click)="openDialogDescription()">info</mat-icon>
+	<h4 class="font-weight-bold" >{{typeObject.name}}</h4>
+		<button mat-button color="primary" matTooltip="open description" matTooltipPosition="right">
+					<mat-icon  class="icon-infodescr" (click)="openDialogDescription()">info</mat-icon>
 		</button>
 		<button mat-button color="primary" matTooltip="view raw JSON" matTooltipPosition="right">
 					<mat-icon  class="icon-infodescr" (click)="openDialogDescription()">visibility</mat-icon>
 		</button>
 </div>
 	
- <div class="d-flex flex-row my-2">
-  <mat-form-field>
+ <div class="d-flex flex-row">
+  <mat-form-field class="mb-3 pe-3">
 	   <mat-label>Search by Name</mat-label>
     	<input matInput (keyup)="applyFilter($event)" placeholder="type in..." #input />
   </mat-form-field>
-  <div id="btn-group" class="col-md-3 mx-5 mt-2">
-		 <button mat-raised-button color="primary" (click)="reloadTable()" >
+  <div id="btn-group" class="col-md-3 ps-3 mt-3">
+		 <button  mat-raised-button color="primary" (click)="reloadTable()" >
 			<mat-icon>replay</mat-icon><span>Reload</span>
 		</button>
-		<button mat-raised-button color="primary" (click)="openDialogAdd()"><mat-icon>add</mat-icon><span>Add new</span></button>
+		<button mat-raised-button color="primary" (click)="openDialogAdd()">
+			<mat-icon>add</mat-icon><span>Add new</span>
+		</button>
 	</div>
 </div>
 
diff --git a/src/main/webapp/app/table-screen/table-screen.component.html b/src/main/webapp/app/table-screen/table-screen.component.html
index 1a1eb58..04f009f 100644
--- a/src/main/webapp/app/table-screen/table-screen.component.html
+++ b/src/main/webapp/app/table-screen/table-screen.component.html
@@ -1,8 +1,7 @@
 <div class="p-3">
 	
-	<!--<h4>Type: {{resourceType}} ({{currentCtx.name}})</h4>-->
 <div class="d-flex flex-row mb-4">
-	<h4 class="font-weight-bold" >Type: {{typeObject.name}}</h4>
+	<h4 class="font-weight-bold" >{{typeObject.name}}</h4>
 		<button mat-button color="primary" matTooltip="open description" matTooltipPosition="right">
 					<mat-icon  class="icon-infodescr" (click)="openDialogDescription()">info</mat-icon>
 		</button>
@@ -11,16 +10,18 @@
 		</button>
 </div>
 	
- <div class="d-flex flex-row my-2">
-  <mat-form-field>
+ <div class="d-flex flex-row">
+  <mat-form-field class="mb-3 pe-3">
 	   <mat-label>Search by Name</mat-label>
     	<input matInput (keyup)="applyFilter($event)" placeholder="type in..." #input />
   </mat-form-field>
-  <div id="btn-group" class="col-md-3 mx-5 mt-2">
+  <div id="btn-group" class="col-md-3 ps-3 mt-3">
 		 <button  mat-raised-button color="primary" (click)="reloadTable()" >
 			<mat-icon>replay</mat-icon><span>Reload</span>
 		</button>
-		<button mat-raised-button color="primary" (click)="openDialogAdd()"><mat-icon>add</mat-icon><span>Add new</span></button>
+		<button mat-raised-button color="primary" (click)="openDialogAdd()">
+			<mat-icon>add</mat-icon><span>Add new</span>
+		</button>
 	</div>
 </div>