diff --git a/app/app.component.ts b/app/app.component.ts
index 167dcc3a80..7e444996aa 100644
--- a/app/app.component.ts
+++ b/app/app.component.ts
@@ -6,7 +6,6 @@ import { Observable } from "rxjs";
 import {
     AccountService, AdalService, CommandService, NodeService, SSHKeyService, SettingsService, SubscriptionService,
 } from "app/services";
-import AccountCreateDialogComponent from "./components/account/add/account-create-dialog.component";
 import { SidebarContentComponent, SidebarManager } from "./components/base/sidebar";
 
 const adalConfig = {
@@ -74,10 +73,6 @@ export class AppComponent implements AfterViewInit, OnInit {
         this.sidebar.open();
     }
 
-    public addAccount() {
-        this.sidebarManager.open("add-account", AccountCreateDialogComponent);
-    }
-
     public logout() {
         this.adalService.logout();
     }
diff --git a/app/app.layout.html b/app/app.layout.html
index c64f30afa6..5fa1d9adb6 100644
--- a/app/app.layout.html
+++ b/app/app.layout.html
@@ -30,16 +30,9 @@
                 <md-sidenav #rightSidebar align="end">
                     <bl-sidebar-content #sidebarContent [sidebar]="rightSidebar"></bl-sidebar-content>
                 </md-sidenav>
-                <!--[hidden]="!(hasAccount | async)"-->
                 <div>
                     <router-outlet></router-outlet>
                 </div>
-                <!--<div *ngIf="!(hasAccount | async)" class="no-account">
-                    <md-card (click)="addAccount()">
-                        <i class="fa fa-user fa-lg"></i>
-                        <div>Add a batch account</div>
-                    </md-card>
-                </div>-->
             </md-sidenav-container>
         </div>
     </section>
diff --git a/app/app.module.ts b/app/app.module.ts
index ed419fcd07..b4c1a2a87d 100644
--- a/app/app.module.ts
+++ b/app/app.module.ts
@@ -5,65 +5,28 @@ import { MaterialModule } from "@angular/material";
 import { BrowserModule } from "@angular/platform-browser";
 import { RouterModule } from "@angular/router";
 
+// application router
 import { routes } from "./app.routes";
 
 // components
-import { NodeConnectModule } from "app/components/node/connect";
-import { StartTaskModule } from "app/components/pool/start-task";
-import { AppComponent } from "./app.component";
-import { DeleteAccountDialogComponent } from "./components/account/action/delete-account-dialog.component";
-import AccountCreateDialogComponent from "./components/account/add/account-create-dialog.component";
-import { AccountBrowseModule } from "./components/account/browse";
-import { AccountDetailsHomeComponent } from "./components/account/details/account-details-home.component";
-import { AccountDetailsComponent } from "./components/account/details/account-details.component";
-import { AccountHomeComponent } from "./components/account/home/account-home.component";
-import { ApplicationModule } from "./components/application/application.module";
-import { BaseModule } from "./components/base";
-import { FileBrowseModule } from "./components/file/browse";
-import { FileDetailsModule } from "./components/file/details";
-import { FileHomeComponent } from "./components/file/home";
-import { JobStatsPreviewComponent } from "./components/job/base/job-stats-preview";
-import { JobAdvancedFilterComponent } from "./components/job/browse/filter/job-advanced-filter.component";
-import { JobListComponent } from "./components/job/browse/job-list.component";
-import { JobDetailsModule } from "./components/job/details";
-import { JobHomeComponent } from "./components/job/home/job-home.component";
-import { NodeBrowseModule } from "./components/node/browse";
-import { NoNodeSelectedComponent, NodeDetailsComponent, NodePropertiesComponent } from "./components/node/details";
-import { NodeHomeComponent } from "./components/node/home";
-import { PoolNodesPreviewComponent } from "./components/pool/base/pool-nodes-preview.component";
-import { PoolAdvancedFilterComponent } from "./components/pool/browse/filter";
-import { PoolListComponent } from "./components/pool/browse/pool-list.component";
-import { PoolDetailsModule } from "./components/pool/details";
-import { PoolGraphsModule } from "./components/pool/graphs";
-import { PoolHomeComponent } from "./components/pool/home/pool-home.component";
-import { MainNavigationComponent } from "./components/shared/main-navigation.component";
-import { TaskBrowseModule } from "./components/task/browse";
-import { TaskDetailsModule } from "./components/task/details";
-import { TaskHomeComponent } from "./components/task/home";
-import { AADUserDropdownComponent } from "./components/user";
+import { AppComponent } from "app/app.component";
+import { MainNavigationComponent } from "app/components/shared/main-navigation.component";
+import { AADUserDropdownComponent } from "app/components/user";
 
-// job actions
-import { JobActionModule } from "./components/job/action";
+// extenal modules
+import { AccountModule } from "app/components/account/account.module";
+import { ApplicationModule } from "app/components/application/application.module";
+import { BaseModule } from "app/components/base";
+import { FileModule } from "app/components/file/file.module";
+import { JobModule } from "app/components/job/job.module";
+import { NodeModule } from "app/components/node/node.module";
+import { PoolModule } from "app/components/pool/pool.module";
+import { TaskModule } from "app/components/task/task.module";
 
-// pool actions
-import {
-    DeletePoolDialogComponent,
-    PoolCreateBasicDialogComponent,
-    PoolOsPickerComponent,
-    PoolResizeDialogComponent,
-} from "./components/pool/action";
-
-// task actions
-import {
-    DeleteTaskDialogComponent,
-    RerunTaskFormComponent,
-    TaskCreateBasicDialogComponent,
-    TerminateTaskDialogComponent,
-} from "./components/task/action";
-import { TaskBaseModule } from "./components/task/base";
+// unhandled application error handler
+import { BatchLabsErrorHandler } from "app/error-handler";
 
 // services
-import { BatchLabsErrorHandler } from "app/error-handler";
 import {
     AccountService,
     AdalService,
@@ -89,13 +52,7 @@ import {
 } from "./services";
 
 const modules = [
-    AccountBrowseModule,
-    ApplicationModule,
-    PoolDetailsModule, PoolGraphsModule, StartTaskModule,
-    JobDetailsModule, JobActionModule,
-    TaskBaseModule, TaskDetailsModule, TaskBrowseModule,
-    NodeBrowseModule, NodeConnectModule,
-    FileBrowseModule, FileDetailsModule,
+    AccountModule, ApplicationModule, FileModule, JobModule, NodeModule, PoolModule, TaskModule,
 ];
 
 @NgModule({
@@ -104,46 +61,11 @@ const modules = [
     ],
     declarations: [
         AADUserDropdownComponent,
-        AccountCreateDialogComponent,
-        AccountDetailsComponent,
-        AccountDetailsHomeComponent,
-        AccountHomeComponent,
         AppComponent,
-        DeleteAccountDialogComponent,
-        DeletePoolDialogComponent,
-        DeleteTaskDialogComponent,
-        FileHomeComponent,
-        JobAdvancedFilterComponent,
-        JobHomeComponent,
-        JobListComponent,
-        JobStatsPreviewComponent,
         MainNavigationComponent,
-        NodeDetailsComponent,
-        NodePropertiesComponent,
-        NodeHomeComponent,
-        NoNodeSelectedComponent,
-        PoolAdvancedFilterComponent,
-        PoolCreateBasicDialogComponent,
-        PoolHomeComponent,
-        PoolListComponent,
-        PoolNodesPreviewComponent,
-        PoolOsPickerComponent,
-        PoolResizeDialogComponent,
-        RerunTaskFormComponent,
-        TaskCreateBasicDialogComponent,
-        TaskHomeComponent,
-        TerminateTaskDialogComponent,
     ],
     entryComponents: [
-        AccountCreateDialogComponent,
-        DeleteAccountDialogComponent,
-        DeletePoolDialogComponent,
-        DeleteTaskDialogComponent,
-        PoolCreateBasicDialogComponent,
-        PoolResizeDialogComponent,
-        RerunTaskFormComponent,
-        TaskCreateBasicDialogComponent,
-        TerminateTaskDialogComponent,
+        // imported in specific area modules
     ],
     imports: [
         BrowserModule,
@@ -161,6 +83,7 @@ const modules = [
         ApplicationService,
         AzureHttpService,
         ArmHttpService,
+        BatchClientService,
         CommandService,
         ElectronRemote,
         ElectronShell,
@@ -168,13 +91,12 @@ const modules = [
         FileSystemService,
         HttpUploadService,
         JobService,
-        PoolService,
-        SubscriptionService,
-        SSHKeyService,
         NodeService,
         NodeUserService,
-        BatchClientService,
+        PoolService,
         SettingsService,
+        SSHKeyService,
+        SubscriptionService,
         TaskService,
         { provide: ErrorHandler, useClass: BatchLabsErrorHandler },
         ...commands,
diff --git a/app/app.routes.ts b/app/app.routes.ts
index b5e436cae0..e8016eedc4 100644
--- a/app/app.routes.ts
+++ b/app/app.routes.ts
@@ -3,23 +3,20 @@ import { Routes } from "@angular/router";
 
 import { Constants } from "app/utils";
 // component imports for routing
-import { AccountDetailsHomeComponent } from "./components/account/details/account-details-home.component";
-import { AccountDetailsComponent } from "./components/account/details/account-details.component";
+import { AccountDefaultComponent, AccountDetailsComponent } from "./components/account/details";
 import { AccountHomeComponent } from "./components/account/home/account-home.component";
-import { ApplicationDefaultComponent } from "./components/application/details/application-default.component";
-import { ApplicationDetailsComponent } from "./components/application/details/application-details.component";
+import { ApplicationDefaultComponent, ApplicationDetailsComponent } from "./components/application/details";
 import { ApplicationHomeComponent } from "./components/application/home/application-home.component";
 import { FileDetailsComponent } from "./components/file/details/file-details.component";
 import { FileHomeComponent } from "./components/file/home";
-import { JobDetailsHomeComponent } from "./components/job/details/job-details-home.component";
-import { JobDetailsComponent } from "./components/job/details/job-details.component";
+import { JobDefaultComponent, JobDetailsComponent } from "./components/job/details";
 import { JobHomeComponent } from "./components/job/home/job-home.component";
-import { NoNodeSelectedComponent, NodeDetailsComponent } from "./components/node/details";
+import { NodeDefaultComponent, NodeDetailsComponent } from "./components/node/details";
 import { NodeHomeComponent } from "./components/node/home";
 import { PoolDetailsComponent } from "./components/pool/details";
-import { PoolDetailsHomeComponent } from "./components/pool/details";
+import { PoolDefaultComponent } from "./components/pool/details";
 import { PoolHomeComponent } from "./components/pool/home/pool-home.component";
-import { NoTaskSelectedComponent, TaskDetailsComponent } from "./components/task/details";
+import { TaskDefaultComponent, TaskDetailsComponent } from "./components/task/details";
 import { TaskHomeComponent } from "./components/task/home";
 
 // set up the routing table
@@ -29,7 +26,7 @@ export const routes: Routes = [
         component: AccountHomeComponent,
         path: "accounts",
         children: [
-            { path: "", component: AccountDetailsHomeComponent }, // accounts/
+            { path: "", component: AccountDefaultComponent }, // accounts/
             { path: ":id", component: AccountDetailsComponent }, // accounts/{account.id}
         ],
     },
@@ -37,7 +34,7 @@ export const routes: Routes = [
         path: "jobs",
         component: JobHomeComponent,
         children: [
-            { path: "", component: JobDetailsHomeComponent }, // jobs/
+            { path: "", component: JobDefaultComponent }, // jobs/
             { path: ":id", component: JobDetailsComponent }, // jobs/{job.id}
         ],
     },
@@ -45,7 +42,7 @@ export const routes: Routes = [
         path: "pools",
         component: PoolHomeComponent,
         children: [
-            { path: "", component: PoolDetailsHomeComponent }, // pools/
+            { path: "", component: PoolDefaultComponent }, // pools/
             { path: ":id", component: PoolDetailsComponent }, // pools/{pool.id}
         ],
     },
@@ -61,7 +58,7 @@ export const routes: Routes = [
         path: "pools/:poolId/nodes",
         component: NodeHomeComponent,
         children: [
-            { path: "", component: NoNodeSelectedComponent }, // pools/{pool.id}/nodes
+            { path: "", component: NodeDefaultComponent }, // pools/{pool.id}/nodes
             { path: ":id", component: NodeDetailsComponent }, // pools/{pool.id}/nodes/{node.id}
         ],
     },
@@ -69,7 +66,7 @@ export const routes: Routes = [
         path: "jobs/:jobId/tasks",
         component: TaskHomeComponent,
         children: [
-            { path: "", component: NoTaskSelectedComponent }, // jobs/{job.id}/tasks
+            { path: "", component: TaskDefaultComponent }, // jobs/{job.id}/tasks
             { path: ":id", component: TaskDetailsComponent }, // jobs/{job.id}/tasks/{task.id}
         ],
     },
diff --git a/app/assets/styles/base/forms.scss b/app/assets/styles/base/forms.scss
index 9399b4763c..1447114d29 100644
--- a/app/assets/styles/base/forms.scss
+++ b/app/assets/styles/base/forms.scss
@@ -117,6 +117,10 @@ fieldset {
             width: 100%;
             margin: 10px 0;
 
+            &.element-spacer {
+                margin-bottom: 15px;
+            }
+
             &.pad-top {
                 margin-top: 20px;
             }
@@ -159,7 +163,7 @@ fieldset {
             md-select {
                 height: 2em;
                 margin-top: 5px;
-                width: 33%;
+                width: 40%;
             }
 
             .input-summary {
diff --git a/app/assets/styles/base/list.scss b/app/assets/styles/base/list.scss
index b5b266c254..8ddbd6af10 100644
--- a/app/assets/styles/base/list.scss
+++ b/app/assets/styles/base/list.scss
@@ -169,5 +169,14 @@ bl-no-item {
                 font-size: 5em;
             }
         }
+
+        &.slim {
+            height: 30px;
+            font-size: 1.05em;
+            align-items: left;
+            justify-content: left;
+            color: $genericGray;
+            display: block;
+        }
     }
 }
diff --git a/app/assets/styles/base/property-list.scss b/app/assets/styles/base/property-list.scss
index 4fd8c08e2a..02890d3c72 100644
--- a/app/assets/styles/base/property-list.scss
+++ b/app/assets/styles/base/property-list.scss
@@ -8,11 +8,14 @@ $group-padding: 28px;
     $value-width: $property-width - $label-width - $label-value-margin - $clipboard-width;
 
     section {
-        width: $property-width;
+        // add an extra 10px to make room for the copy button
+        width: $property-width + 10px;
+
         label, > table td.label {
             width: $label-width !important;
             min-width: $label-width;
         }
+
         .value {
             width: $value-width;
         }
@@ -162,7 +165,7 @@ bl-property-group {
         }
 
         > table {
-            $table-width: $property-width - $clipboard-width + 1;
+            $table-width: $property-width - $clipboard-width + 15;
             width: $table-width;
             max-width: $table-width;
             table-layout: fixed;
@@ -192,18 +195,18 @@ bl-property-group {
                 padding: 5px;
                 padding-left: 20px;
                 font-size: $value-font-size;
-                height: 23px;
+                height: 20px;
             }
 
             bl-tp-cell {
                 cursor: pointer;
                 font-size: $value-font-size;
-                height: 23px;
+                height: 20px;
                 position: relative;
                 padding: 0;
 
                 .cell-value {
-                    padding: 5px 8px;
+                    padding: 4px 8px;
                     text-overflow: ellipsis;
                     overflow: hidden;
                 }
diff --git a/app/assets/styles/job/details.scss b/app/assets/styles/job/details.scss
index a4539622d1..3ebd6cc37e 100644
--- a/app/assets/styles/job/details.scss
+++ b/app/assets/styles/job/details.scss
@@ -11,7 +11,6 @@ bl-job-details {
 
 bl-job-progress-status {
     display: block;
-
     padding-top: 5px;
 
     .running-task-status {
@@ -20,7 +19,7 @@ bl-job-progress-status {
 
     .running {
         width: 220px;
-        height: 180px;
+        height: 130px;
     }
 
     .queued, .completed {
@@ -43,7 +42,7 @@ bl-job-progress-status {
     .toggle-job-pool-tasks {
         margin: 0 10px;
         display: flex;
-        font-size: 11px;
+        font-size: 12px;
         justify-content: space-between;
 
         > .option {
@@ -51,9 +50,8 @@ bl-job-progress-status {
 
             &.active {
                 color: map-get($md-prussian-blue, 600);
-                text-decoration: underline;
+                font-weight: bold;
             }
         }
     }
-
 }
diff --git a/app/assets/styles/pool/base.scss b/app/assets/styles/pool/base.scss
index 56df45a28e..f48dbbb246 100644
--- a/app/assets/styles/pool/base.scss
+++ b/app/assets/styles/pool/base.scss
@@ -1,4 +1,10 @@
 bl-pool-nodes-preview {
+    > div.large {
+        span {
+            font-size: 1.5em;
+        }
+    }
+
     .resize-error {
         color: $red;
         font-weight: bold;
diff --git a/app/assets/styles/pool/create.scss b/app/assets/styles/pool/create.scss
index 00f7cbadd6..18af359d74 100644
--- a/app/assets/styles/pool/create.scss
+++ b/app/assets/styles/pool/create.scss
@@ -3,8 +3,13 @@ bl-pool-os-picker {
         margin: 0;
     }
 
+    .serviceReference {
+        display: flex;
+    }
+
     .imageReference {
         display: flex;
+
         > .form-element {
             width: 30%;
             margin-right: 10px;
diff --git a/app/assets/styles/vendor/material-theme.scss b/app/assets/styles/vendor/material-theme.scss
index 1abec4c66b..9133d5198e 100644
--- a/app/assets/styles/vendor/material-theme.scss
+++ b/app/assets/styles/vendor/material-theme.scss
@@ -176,3 +176,7 @@ md-input-container.bl-textarea {
         padding: 5px;
     }
 }
+
+.mat-select-placeholder {
+    margin-top: 6px;
+}
diff --git a/app/components/account/account.module.ts b/app/components/account/account.module.ts
new file mode 100644
index 0000000000..f9800fcc4c
--- /dev/null
+++ b/app/components/account/account.module.ts
@@ -0,0 +1,29 @@
+import { NgModule } from "@angular/core";
+
+import { commonModules } from "app/common";
+import { AccountCreateDialogComponent } from "app/components/account/action/add/account-create-dialog.component";
+import { DeleteAccountDialogComponent } from "app/components/account/action/delete/delete-account-dialog.component";
+import { AccountBrowseModule } from "app/components/account/browse";
+import { AccountDefaultComponent, AccountDetailsComponent } from "app/components/account/details";
+import { AccountHomeComponent } from "app/components/account/home";
+
+const components = [
+    AccountCreateDialogComponent, AccountDefaultComponent, AccountDetailsComponent,
+    AccountHomeComponent, DeleteAccountDialogComponent,
+];
+
+const modules = [
+    AccountBrowseModule, ...commonModules,
+];
+
+@NgModule({
+    declarations: components,
+    exports: [...modules, ...components],
+    imports: [...modules],
+    entryComponents: [
+        AccountCreateDialogComponent,
+        DeleteAccountDialogComponent,
+    ],
+})
+export class AccountModule {
+}
diff --git a/app/components/account/add/account-create-dialog.component.ts b/app/components/account/action/add/account-create-dialog.component.ts
similarity index 51%
rename from app/components/account/add/account-create-dialog.component.ts
rename to app/components/account/action/add/account-create-dialog.component.ts
index 64f7166662..1184ddef83 100644
--- a/app/components/account/add/account-create-dialog.component.ts
+++ b/app/components/account/action/add/account-create-dialog.component.ts
@@ -2,14 +2,14 @@ import { Component } from "@angular/core";
 import { FormBuilder } from "@angular/forms";
 import { Router } from "@angular/router";
 
+import { SidebarRef } from "app/components/base/sidebar";
 import { AccountService } from "app/services";
-import { SidebarRef } from "../../base/sidebar";
 
 @Component({
     selector: "bl-account-create-dialog",
     templateUrl: "account-create-dialog.html",
 })
-export default class AccountCreateDialogComponent {
+export class AccountCreateDialogComponent {
     public isSaving: boolean = false;
 
     constructor(
@@ -21,16 +21,5 @@ export default class AccountCreateDialogComponent {
 
     public onSubmit() {
         alert("Not supported yet!");
-        // this.isSaving = true;
-        // const account  = Object.assign({}, this.account);
-        // this.accountService.add(account).subscribe(
-        //     (val) => { this.resetForm(); },
-        //     (error) => { log.error("storeAccount() :: error: ", error); },
-        //     () => {
-        //         this.isSaving = false;
-        //         this.sidebarRef.destroy();
-        //         this.router.navigate(["/accounts", account.id]);
-        //     },
-        // );
     }
 }
diff --git a/app/components/account/add/account-create-dialog.html b/app/components/account/action/add/account-create-dialog.html
similarity index 100%
rename from app/components/account/add/account-create-dialog.html
rename to app/components/account/action/add/account-create-dialog.html
diff --git a/app/components/account/action/delete-account-dialog.component.ts b/app/components/account/action/delete/delete-account-dialog.component.ts
similarity index 67%
rename from app/components/account/action/delete-account-dialog.component.ts
rename to app/components/account/action/delete/delete-account-dialog.component.ts
index 6e1975ef29..91a0d69d99 100644
--- a/app/components/account/action/delete-account-dialog.component.ts
+++ b/app/components/account/action/delete/delete-account-dialog.component.ts
@@ -18,9 +18,5 @@ export class DeleteAccountDialogComponent {
 
     public destroyAccount() {
         alert("Not supported yet!");
-        // this.accountService.delete(this.accountId).subscribe({
-        //     error: (error) => { log.error("destroyAccount() :: error: ", error); },
-        //     complete: () => this.dialogRef.close(), // todo: clear current selection, show notification
-        // });
     }
 }
diff --git a/app/components/account/action/delete-account-dialog.html b/app/components/account/action/delete/delete-account-dialog.html
similarity index 100%
rename from app/components/account/action/delete-account-dialog.html
rename to app/components/account/action/delete/delete-account-dialog.html
diff --git a/app/components/account/details/account-details-home.component.ts b/app/components/account/details/account-default.component.ts
similarity index 89%
rename from app/components/account/details/account-details-home.component.ts
rename to app/components/account/details/account-default.component.ts
index 94c1d1d0f3..17c54cd968 100644
--- a/app/components/account/details/account-details-home.component.ts
+++ b/app/components/account/details/account-default.component.ts
@@ -10,7 +10,7 @@ import { Component } from "@angular/core";
     `,
 })
 
-export class AccountDetailsHomeComponent {
+export class AccountDefaultComponent {
     public static breadcrumb() {
         return { name: "Accounts" };
     }
diff --git a/app/components/account/details/account-details.component.ts b/app/components/account/details/account-details.component.ts
index 73acf0c7b0..324e1d6521 100644
--- a/app/components/account/details/account-details.component.ts
+++ b/app/components/account/details/account-details.component.ts
@@ -1,11 +1,9 @@
 import { Component, NgZone, OnDestroy, OnInit, ViewContainerRef } from "@angular/core";
-import { MdDialog, MdDialogConfig } from "@angular/material";
 import { ActivatedRoute, Router } from "@angular/router";
 import { Subscription } from "rxjs/Subscription";
 
 import { AccountResource } from "app/models";
 import { AccountService } from "app/services";
-import { DeleteAccountDialogComponent } from "../action/delete-account-dialog.component";
 
 @Component({
     selector: "bl-account-details",
@@ -29,7 +27,6 @@ export class AccountDetailsComponent implements OnInit, OnDestroy {
     private _paramsSubscriber: Subscription;
 
     constructor(
-        private dialog: MdDialog,
         private router: Router,
         private activatedRoute: ActivatedRoute,
         private accountService: AccountService,
@@ -59,21 +56,6 @@ export class AccountDetailsComponent implements OnInit, OnDestroy {
         this._paramsSubscriber.unsubscribe();
     }
 
-    public deleteAccount() {
-        if (!this.account) {
-            return;
-        }
-        let config = new MdDialogConfig();
-        config.viewContainerRef = this.viewContainerRef;
-
-        const dialogRef = this.dialog.open(DeleteAccountDialogComponent, config);
-        dialogRef.componentInstance.accountId = this.accountId;
-        dialogRef.componentInstance.accountName = this.account.name;
-        dialogRef.afterClosed().subscribe(() => {
-            this.router.navigate(["/accounts"]);
-        });
-    }
-
     public selectAccount(accountId: string): void {
         this.accountService.selectAccount(accountId);
     }
diff --git a/app/components/account/details/account-details.html b/app/components/account/details/account-details.html
index f126c113c4..4d1961ac77 100644
--- a/app/components/account/details/account-details.html
+++ b/app/components/account/details/account-details.html
@@ -10,7 +10,6 @@
             <md-card-content>
             </md-card-content>
             <md-card-actions layout="row" layout-align="end center">
-                <!--<bl-delete-button [entity]="account" (click)="deleteAccount()"></bl-delete-button>-->
             </md-card-actions>
         </md-card>
         <div class="account-links">
diff --git a/app/components/account/details/index.ts b/app/components/account/details/index.ts
new file mode 100644
index 0000000000..e61034ada8
--- /dev/null
+++ b/app/components/account/details/index.ts
@@ -0,0 +1,2 @@
+export * from "./account-default.component";
+export * from "./account-details.component";
diff --git a/app/components/account/home/account-home.component.ts b/app/components/account/home/account-home.component.ts
index 6570757859..2b976f57e2 100644
--- a/app/components/account/home/account-home.component.ts
+++ b/app/components/account/home/account-home.component.ts
@@ -1,8 +1,4 @@
 import { Component } from "@angular/core";
-import { FormBuilder } from "@angular/forms";
-
-import { SidebarManager } from "../../base/sidebar";
-import AccountCreateDialogComponent from "../add/account-create-dialog.component";
 
 enum ListType {
     Favourite,
@@ -15,16 +11,5 @@ enum ListType {
 })
 export class AccountHomeComponent {
     public ListType = ListType;
-
     public showType: ListType = ListType.All;
-
-    constructor(private formBuilder: FormBuilder, private sidebarManager: SidebarManager) {
-    }
-
-    public addAccount() {
-        const ref = this.sidebarManager.open("add-account", AccountCreateDialogComponent);
-        ref.afterCompletition.subscribe(() => {
-            //
-        });
-    }
 }
diff --git a/app/components/account/home/account-home.html b/app/components/account/home/account-home.html
index 6e40f2805d..cb405e12f6 100644
--- a/app/components/account/home/account-home.html
+++ b/app/components/account/home/account-home.html
@@ -1,8 +1,5 @@
 <bl-list-and-show-layout #layout>
     <div bl-list-buttons>
-        <!--<button md-mini-fab color="primary" title="Add an account" (click)="addAccount()">
-            <i class="fa fa-plus"></i>
-        </button>-->
     </div>
     <div bl-list-content>
         <md-radio-group [(ngModel)]="showType" class="flex-center">
diff --git a/app/components/account/home/index.ts b/app/components/account/home/index.ts
new file mode 100644
index 0000000000..20a51bbdc4
--- /dev/null
+++ b/app/components/account/home/index.ts
@@ -0,0 +1 @@
+export * from "./account-home.component";
diff --git a/app/components/base/quick-list/no-item.component.ts b/app/components/base/quick-list/no-item.component.ts
index e6b9b51309..d9f5ac58b7 100644
--- a/app/components/base/quick-list/no-item.component.ts
+++ b/app/components/base/quick-list/no-item.component.ts
@@ -6,7 +6,11 @@ import { Filter } from "app/utils/filter-builder";
 @Component({
     selector: "bl-no-item",
     template: `
-        <div class="no-item-message" *ngIf="status !== loadingStatuses.Loading && itemCount === 0">
+        <div
+            class="no-item-message"
+            [ngClass]="{'slim': _slimline }"
+            *ngIf="status !== loadingStatuses.Loading && itemCount === 0">
+
             <ng-content select="[icon]"></ng-content>
             <ng-content select="[no-filter]" *ngIf="!withFilter"></ng-content>
             <ng-content select="[with-filter]" *ngIf="withFilter"></ng-content>
@@ -26,8 +30,13 @@ export class NoItemComponent {
         this.withFilter = Boolean(filter && !filter.isEmpty());
     }
 
-    public withFilter = false;
+    @Input()
+    public set slimline(slimline: boolean) {
+        this._slimline = slimline;
+    }
 
+    public withFilter = false;
     public loadingStatuses = LoadingStatus;
 
+    private _slimline = false;
 }
diff --git a/app/components/file/file.module.ts b/app/components/file/file.module.ts
new file mode 100644
index 0000000000..1fed46d8f3
--- /dev/null
+++ b/app/components/file/file.module.ts
@@ -0,0 +1,24 @@
+import { NgModule } from "@angular/core";
+
+import { commonModules } from "app/common";
+import { FileBrowseModule } from "app/components/file/browse";
+import { FileDetailsModule } from "app/components/file/details";
+import { FileHomeComponent } from "app/components/file/home";
+
+const components = [
+    FileHomeComponent,
+];
+
+const modules = [
+    FileBrowseModule, FileDetailsModule, ...commonModules,
+];
+
+@NgModule({
+    declarations: components,
+    exports: [...modules, ...components],
+    imports: [...modules],
+    entryComponents: [
+    ],
+})
+export class FileModule {
+}
diff --git a/app/components/job/browse/job-list.html b/app/components/job/browse/job-list.html
index 49682dc554..dd5c62ef38 100644
--- a/app/components/job/browse/job-list.html
+++ b/app/components/job/browse/job-list.html
@@ -25,6 +25,7 @@ <h4 bl-quick-list-item-title>{{job.id}}</h4>
         <bl-cell>{{job.poolInfo?.poolId}}</bl-cell>
     </bl-row>
 </bl-table>
+
 <bl-no-item [itemCount]="(data.items | async).size" [filter]="filter" [status]="status | async">
     <i icon class="fa fa-tasks"></i>
     <span no-filter>No jobs</span>
diff --git a/app/components/job/details/index.ts b/app/components/job/details/index.ts
index d3440403df..40573eb151 100644
--- a/app/components/job/details/index.ts
+++ b/app/components/job/details/index.ts
@@ -1,4 +1,5 @@
+export * from "./job-configuration.component";
+export * from "./job-default.component";
 export * from "./job-details.module";
 export * from "./job-details.component";
-export * from "./job-properties.component";
 export * from "./error-display";
diff --git a/app/components/job/details/job-properties.component.ts b/app/components/job/details/job-configuration.component.ts
similarity index 80%
rename from app/components/job/details/job-properties.component.ts
rename to app/components/job/details/job-configuration.component.ts
index d1b5c2d561..7727d2ce2f 100644
--- a/app/components/job/details/job-properties.component.ts
+++ b/app/components/job/details/job-configuration.component.ts
@@ -1,6 +1,6 @@
 import { ChangeDetectionStrategy, Component, Input, ViewContainerRef } from "@angular/core";
 
-import { Job } from "app/models";
+import { Job, NameValuePair } from "app/models";
 import {
     JobDecorator,
     JobManagerTaskDecorator,
@@ -9,11 +9,11 @@ import {
 } from "app/models/decorators";
 
 @Component({
-    selector: "bl-job-properties",
-    templateUrl: "job-properties.html",
+    selector: "bl-job-configuration",
+    templateUrl: "job-configuration.html",
     changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class JobPropertiesComponent {
+export class JobConfigurationComponent {
     @Input()
     public set job(job: Job) {
         this._job = job;
@@ -32,6 +32,8 @@ export class JobPropertiesComponent {
     public managerTask: JobManagerTaskDecorator;
     public prepTask: JobPreparationTaskDecorator;
     public releaseTask: JobReleaseTaskDecorator;
+    public environmentSettings: NameValuePair[] = [];
+    public jobMetadata: NameValuePair[] = [];
     public poolInfo: any = {};
     public hasStartTime: boolean;
     public hasEndTime: boolean;
@@ -51,6 +53,8 @@ export class JobPropertiesComponent {
             this.prepTask = this.decorator.jobPreparationTask;
             this.releaseTask = this.decorator.jobReleaseTask;
             this.poolInfo = this.decorator.poolInfo || {};
+            this.environmentSettings = this.job.commonEnvironmentSettings || [];
+            this.jobMetadata = this.job.metadata || [];
         }
     }
 }
diff --git a/app/components/job/details/job-properties.html b/app/components/job/details/job-configuration.html
similarity index 85%
rename from app/components/job/details/job-properties.html
rename to app/components/job/details/job-configuration.html
index 2bfe1a06c2..eb3e0d6a58 100644
--- a/app/components/job/details/job-properties.html
+++ b/app/components/job/details/job-configuration.html
@@ -20,6 +20,16 @@
         <bl-text-property label="Max wall-clock time" [value]="constraints.maxWallClockTime"></bl-text-property>
     </bl-property-group>
 
+    <bl-property-group label="Environment settings" class="wide" [collapsed]="true">
+        <div collapsed-preview>
+            <span>{{environmentSettings?.length}} environment settings</span>
+        </div>
+        <bl-text-property *ngFor="let setting of environmentSettings" label="{{setting.name}}" [value]="setting.value"></bl-text-property>
+        <bl-no-item [itemCount]="environmentSettings.length" [slimline]="true">
+            <span no-filter>This job contains no environment settings</span>
+        </bl-no-item>
+    </bl-property-group>
+
     <bl-property-group label="Execution information" class="wide" [collapsed]="true">
         <div collapsed-preview>
             <span *ngIf="!hasStartTime">Job not started</span>
@@ -41,6 +51,7 @@
     </bl-property-group>
 
     <bl-property-group *ngIf="job.jobPreparationTask" label="Job preparation task" class="wide" [collapsed]="true">
+        <div collapsed-preview></div>
         <bl-text-property label="Id" [value]="prepTask.id"></bl-text-property>
         <bl-text-property label="Command line" [value]="prepTask.commandLine"></bl-text-property>
         <bl-text-property label="Max task retry count" [value]="prepTask.constraints.maxTaskRetryCount"></bl-text-property>
@@ -72,6 +83,7 @@
     </bl-property-group>
 
     <bl-property-group *ngIf="job.jobReleaseTask" label="Job release task" class="wide" [collapsed]="true">
+        <div collapsed-preview></div>
         <bl-text-property label="Id" [value]="releaseTask.id"></bl-text-property>
         <bl-text-property label="Command line" [value]="releaseTask.commandLine"></bl-text-property>
         <bl-text-property label="Max wall-clock time" [value]="releaseTask.maxWallClockTime"></bl-text-property>
@@ -98,4 +110,14 @@
             </bl-table-property-row>
         </bl-table-property>
     </bl-property-group>
+
+    <bl-property-group label="Metadata" class="wide" [collapsed]="true">
+        <div collapsed-preview>
+            <span>{{jobMetadata?.length}} meta items</span>
+        </div>
+        <bl-text-property *ngFor="let metaItem of jobMetadata" label="{{metaItem.name}}" [value]="metaItem.value"></bl-text-property>
+        <bl-no-item [itemCount]="jobMetadata.length" [slimline]="true">
+            <span no-filter>This job contains no metadata</span>
+        </bl-no-item>
+    </bl-property-group>
 </bl-property-list>
diff --git a/app/components/job/details/job-details-home.component.ts b/app/components/job/details/job-default.component.ts
similarity index 89%
rename from app/components/job/details/job-details-home.component.ts
rename to app/components/job/details/job-default.component.ts
index 8b1ecc9854..6f28681d55 100644
--- a/app/components/job/details/job-details-home.component.ts
+++ b/app/components/job/details/job-default.component.ts
@@ -10,7 +10,7 @@ import { Component } from "@angular/core";
     `,
 })
 
-export class JobDetailsHomeComponent {
+export class JobDefaultComponent {
     public static breadcrumb() {
         return { name: "Jobs" };
     }
diff --git a/app/components/job/details/job-details.html b/app/components/job/details/job-details.html
index 3beee3fb37..8ff091b810 100644
--- a/app/components/job/details/job-details.html
+++ b/app/components/job/details/job-details.html
@@ -32,21 +32,9 @@
         <bl-job-error-display [job]="job"></bl-job-error-display>
         <md-card class="details">
             <bl-tab-group>
-                <bl-tab key="properties">
-                    <bl-tab-label>Properties</bl-tab-label>
-                    <bl-job-properties [job]="job"></bl-job-properties>
-                </bl-tab>
-                <bl-tab key="envs">
-                    <bl-tab-label>Environment Settings</bl-tab-label>
-                    <div class="tab-padding">
-                        <bl-job-environment-settings [job]="job"></bl-job-environment-settings>
-                    </div>
-                </bl-tab>
-                <bl-tab key="metadata">
-                    <bl-tab-label>Metadata</bl-tab-label>
-                    <div class="tab-padding">
-                        <bl-job-metadata [job]="job"></bl-job-metadata>
-                    </div>
+                <bl-tab key="configuration">
+                    <bl-tab-label>Configuration</bl-tab-label>
+                    <bl-job-configuration [job]="job"></bl-job-configuration>
                 </bl-tab>
                 <bl-tab key="tasks">
                     <bl-tab-label>Tasks</bl-tab-label>
diff --git a/app/components/job/details/job-details.module.ts b/app/components/job/details/job-details.module.ts
index a07339da9c..53e993e00e 100644
--- a/app/components/job/details/job-details.module.ts
+++ b/app/components/job/details/job-details.module.ts
@@ -1,33 +1,35 @@
 import { NgModule } from "@angular/core";
 
 import { commonModules } from "app/common";
+import { BaseModule } from "app/components/base";
 import { FileBrowseModule } from "app/components/file/browse";
 import { FileDetailsModule } from "app/components/file/details";
 import { TaskBrowseModule } from "app/components/task/browse";
-
 import { JobErrorDisplayComponent } from "./error-display";
-import { JobDetailsHomeComponent } from "./job-details-home.component";
+import { JobConfigurationComponent } from "./job-configuration.component";
+import { JobDefaultComponent } from "./job-default.component";
 import { JobDetailsComponent } from "./job-details.component";
-import { JobEnvironmentSettingsComponent } from "./job-env-settings.component";
-import { JobMetadataComponent } from "./job-metadata.component";
 import { JobProgressStatusComponent } from "./job-progress-status";
-import { JobPropertiesComponent } from "./job-properties.component";
 
 const components = [
-    JobErrorDisplayComponent,
-    JobDetailsHomeComponent,
+    JobConfigurationComponent,
+    JobDefaultComponent,
     JobDetailsComponent,
-    JobEnvironmentSettingsComponent,
-    JobMetadataComponent,
-    JobPropertiesComponent,
+    JobErrorDisplayComponent,
     JobProgressStatusComponent,
 ];
 
+const modules = [
+    BaseModule, FileBrowseModule, FileDetailsModule, TaskBrowseModule,
+];
+
 @NgModule({
     declarations: components,
     exports: components,
-    imports: [...commonModules,
-        FileBrowseModule, FileDetailsModule, TaskBrowseModule],
+    imports: [
+        ...commonModules,
+        ...modules,
+    ],
 })
 export class JobDetailsModule {
 }
diff --git a/app/components/job/details/job-env-settings.component.ts b/app/components/job/details/job-env-settings.component.ts
deleted file mode 100644
index 1111de7653..0000000000
--- a/app/components/job/details/job-env-settings.component.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { Component, Input, ViewContainerRef } from "@angular/core";
-
-import { Job, NameValuePair } from "app/models";
-
-@Component({
-    selector: "bl-job-environment-settings",
-    templateUrl: "job-env-settings.html",
-})
-
-export class JobEnvironmentSettingsComponent {
-    @Input()
-    public set job(job: Job) {
-        this._job = job;
-        this.refresh(job);
-    }
-    public get job() { return this._job; }
-    public environmentSettings: NameValuePair[] = [];
-
-    private _job: Job;
-
-    constructor(
-        private viewContainerRef: ViewContainerRef) {
-    }
-
-    public refresh(job: Job) {
-        if (this.job) {
-            this.environmentSettings = this.job.commonEnvironmentSettings || [];
-        }
-    }
-}
diff --git a/app/components/job/details/job-env-settings.html b/app/components/job/details/job-env-settings.html
deleted file mode 100644
index 95691d270b..0000000000
--- a/app/components/job/details/job-env-settings.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<bl-property-list>
-    <bl-property-group label="Environment settings" class="wide">
-        <bl-text-property *ngFor="let setting of environmentSettings" label="{{setting.name}}" [value]="setting.value"></bl-text-property>
-    </bl-property-group>
-</bl-property-list> 
-<bl-no-item [itemCount]="environmentSettings.length">
-    <span no-filter>This job contains no environment settings</span>
-</bl-no-item>
diff --git a/app/components/job/details/job-metadata.component.ts b/app/components/job/details/job-metadata.component.ts
deleted file mode 100644
index 330f8735d6..0000000000
--- a/app/components/job/details/job-metadata.component.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { Component, Input, ViewContainerRef } from "@angular/core";
-
-import { Job, NameValuePair } from "app/models";
-
-@Component({
-    selector: "bl-job-metadata",
-    templateUrl: "job-metadata.html",
-})
-export class JobMetadataComponent {
-    @Input()
-    public set job(job: Job) {
-        this._job = job;
-        this.refresh(job);
-    }
-    public get job() { return this._job; }
-    public jobMetadata: NameValuePair[] = [];
-
-    private _job: Job;
-
-    constructor(
-        private viewContainerRef: ViewContainerRef) {
-    }
-
-    public refresh(job: Job) {
-        if (this.job) {
-            this.jobMetadata = this.job.metadata || [];
-        }
-    }
-}
diff --git a/app/components/job/details/job-metadata.html b/app/components/job/details/job-metadata.html
deleted file mode 100644
index dabdd27d71..0000000000
--- a/app/components/job/details/job-metadata.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<bl-property-list>
-    <bl-property-group label="Metadata" class="wide">
-        <bl-text-property *ngFor="let metaItem of jobMetadata" label="{{metaItem.name}}" [value]="metaItem.value"></bl-text-property>
-    </bl-property-group>
-</bl-property-list> 
-<bl-no-item [itemCount]="jobMetadata.length">
-    <span no-filter>This job contains no metadata</span>
-</bl-no-item>
diff --git a/app/components/job/job.module.ts b/app/components/job/job.module.ts
new file mode 100644
index 0000000000..d8cfffa30d
--- /dev/null
+++ b/app/components/job/job.module.ts
@@ -0,0 +1,27 @@
+import { NgModule } from "@angular/core";
+
+import { commonModules } from "app/common";
+import { JobActionModule } from "app/components/job/action";
+import { JobStatsPreviewComponent } from "app/components/job/base/job-stats-preview";
+import { JobAdvancedFilterComponent } from "app/components/job/browse/filter/job-advanced-filter.component";
+import { JobListComponent } from "app/components/job/browse/job-list.component";
+import { JobDetailsModule } from "app/components/job/details";
+import { JobHomeComponent } from "app/components/job/home/job-home.component";
+
+const components = [
+    JobAdvancedFilterComponent, JobHomeComponent, JobListComponent, JobStatsPreviewComponent,
+];
+
+const modules = [
+    JobActionModule, JobDetailsModule, ...commonModules,
+];
+
+@NgModule({
+    declarations: components,
+    exports: [...modules, ...components],
+    imports: [...modules],
+    entryComponents: [
+    ],
+})
+export class JobModule {
+}
diff --git a/app/components/node/browse/node-list.component.ts b/app/components/node/browse/node-list.component.ts
index ed6fde01e8..a6f0fb7ee9 100644
--- a/app/components/node/browse/node-list.component.ts
+++ b/app/components/node/browse/node-list.component.ts
@@ -69,6 +69,7 @@ export class NodeListComponent extends SelectableList implements OnInit {
         this.data = this.nodeService.list(this.poolId);
         this.status = this.data.status;
         this.data.setOptions({}); // This clears the previous list objects
+
         return this.data.fetchNext(true);
     }
 
diff --git a/app/components/node/details/index.ts b/app/components/node/details/index.ts
index 21087fd970..3c1375f987 100644
--- a/app/components/node/details/index.ts
+++ b/app/components/node/details/index.ts
@@ -1,3 +1,3 @@
+export * from "./node-configuration.component";
+export * from "./node-default.component";
 export * from "./node-details.component";
-export * from "./node-properties.component";
-export * from "./no-node-selected.component";
diff --git a/app/components/node/details/node-properties.component.ts b/app/components/node/details/node-configuration.component.ts
similarity index 89%
rename from app/components/node/details/node-properties.component.ts
rename to app/components/node/details/node-configuration.component.ts
index 18f69eb4af..439984b1c6 100644
--- a/app/components/node/details/node-properties.component.ts
+++ b/app/components/node/details/node-configuration.component.ts
@@ -6,10 +6,10 @@ import { NodeService } from "app/services";
 import { PoolUtils } from "app/utils";
 
 @Component({
-    selector: "bl-node-properties",
-    templateUrl: "node-properties.html",
+    selector: "bl-node-configuration",
+    templateUrl: "node-configuration.html",
 })
-export class NodePropertiesComponent implements OnChanges {
+export class NodeConfigurationComponent implements OnChanges {
     @Input()
     public pool: Pool;
 
diff --git a/app/components/node/details/node-properties.html b/app/components/node/details/node-configuration.html
similarity index 100%
rename from app/components/node/details/node-properties.html
rename to app/components/node/details/node-configuration.html
diff --git a/app/components/node/details/no-node-selected.component.ts b/app/components/node/details/node-default.component.ts
similarity index 90%
rename from app/components/node/details/no-node-selected.component.ts
rename to app/components/node/details/node-default.component.ts
index b678f91c5e..103a8e6f46 100644
--- a/app/components/node/details/no-node-selected.component.ts
+++ b/app/components/node/details/node-default.component.ts
@@ -9,7 +9,7 @@ import { Component } from "@angular/core";
         </div>
     `,
 })
-export class NoNodeSelectedComponent {
+export class NodeDefaultComponent {
     public static breadcrumb(params, queryParams) {
         return { name: "Nodes" };
     }
diff --git a/app/components/node/details/node-details.html b/app/components/node/details/node-details.html
index c7daf12165..32b4f8f66e 100644
--- a/app/components/node/details/node-details.html
+++ b/app/components/node/details/node-details.html
@@ -21,9 +21,9 @@
         </md-card>
         <md-card class="details">
             <bl-tab-group>
-                <bl-tab key="properties">
-                    <bl-tab-label>Properties</bl-tab-label>
-                    <bl-node-properties [pool]="pool" [node]="node"></bl-node-properties>
+                <bl-tab key="configuration">
+                    <bl-tab-label>Configuration</bl-tab-label>
+                    <bl-node-configuration [pool]="pool" [node]="node"></bl-node-configuration>
                 </bl-tab>
                 <bl-tab key="files">
                     <bl-tab-label>Files</bl-tab-label>
diff --git a/app/components/node/node.module.ts b/app/components/node/node.module.ts
new file mode 100644
index 0000000000..91e013267b
--- /dev/null
+++ b/app/components/node/node.module.ts
@@ -0,0 +1,26 @@
+import { NgModule } from "@angular/core";
+
+import { commonModules } from "app/common";
+import { FileBrowseModule } from "app/components/file/browse";
+import { NodeBrowseModule } from "app/components/node/browse";
+import { NodeConnectModule } from "app/components/node/connect";
+import { NodeConfigurationComponent, NodeDefaultComponent, NodeDetailsComponent } from "app/components/node/details";
+import { NodeHomeComponent } from "app/components/node/home";
+
+const components = [
+    NodeConfigurationComponent, NodeDefaultComponent, NodeDetailsComponent, NodeHomeComponent,
+];
+
+const modules = [
+    FileBrowseModule, NodeBrowseModule, NodeConnectModule, ...commonModules,
+];
+
+@NgModule({
+    declarations: components,
+    exports: [...modules, ...components],
+    imports: [...modules],
+    entryComponents: [
+    ],
+})
+export class NodeModule {
+}
diff --git a/app/components/pool/action/add/pool-create-basic-dialog.html b/app/components/pool/action/add/pool-create-basic-dialog.html
index 9c21ecd4d0..b5691172fc 100644
--- a/app/components/pool/action/add/pool-create-basic-dialog.html
+++ b/app/components/pool/action/add/pool-create-basic-dialog.html
@@ -27,7 +27,7 @@ <h1>Add a pool to the account</h1>
                 <bl-error controlName="targetDedicated" code="required">Target size is a required field</bl-error>
             </div>
 
-            <div class="form-element">
+            <div class="form-element element-spacer">
                 <md-select formControlName="vmSize" placeholder="VM size">
                     <md-option *ngFor="let vmSize of vmSizes" value="{{vmSize}}">{{vmSize}}</md-option>
                 </md-select>
diff --git a/app/components/pool/action/add/pool-os-picker.html b/app/components/pool/action/add/pool-os-picker.html
index 5cd6774678..515da2ece4 100644
--- a/app/components/pool/action/add/pool-os-picker.html
+++ b/app/components/pool/action/add/pool-os-picker.html
@@ -1,5 +1,5 @@
 <div [formGroup]="form">
-    <div class="form-element" class="source">
+    <div class="form-element element-spacer">
         <h4>Select an operating system configuration</h4>
         <div class="infrastructure">
             <md-radio-group formControlName="source">
@@ -10,7 +10,7 @@ <h4>Select an operating system configuration</h4>
     </div>
 
     <div *ngIf="selectedSource === PoolOsSources.PaaS">
-        <div formGroupName="cloudServiceConfiguration">
+        <div formGroupName="cloudServiceConfiguration" class="serviceReference">
             <div class="form-element">
                 <md-select formControlName="osFamily" placeholder="Operating System">
                     <md-option *ngFor="let osFamily of cloudServiceOsFamilies" [value]="osFamily.id">{{osFamily.name}}</md-option>
diff --git a/app/components/pool/base/pool-nodes-preview.component.ts b/app/components/pool/base/pool-nodes-preview.component.ts
index cd562371e1..5600091ecb 100644
--- a/app/components/pool/base/pool-nodes-preview.component.ts
+++ b/app/components/pool/base/pool-nodes-preview.component.ts
@@ -10,6 +10,12 @@ export class PoolNodesPreviewComponent {
     @Input()
     public pool: Pool;
 
+    @Input()
+    public tooltipPosition: string = "below";
+
+    @Input()
+    public largeIcon: boolean = false;
+
     public get tooltipMessage() {
         if (this.pool.resizeError) {
             return "There was a resize error";
diff --git a/app/components/pool/base/pool-nodes-preview.html b/app/components/pool/base/pool-nodes-preview.html
index ac8def3cb0..2327b34936 100644
--- a/app/components/pool/base/pool-nodes-preview.html
+++ b/app/components/pool/base/pool-nodes-preview.html
@@ -1,8 +1,8 @@
-<span [class.resize-error]="pool.resizeError" md-tooltip="{{tooltipMessage}}" tooltip-position="after">
-    <i class="fa fa-tv"></i>
+<div [class.resize-error]="pool.resizeError" [class.large]="largeIcon" md-tooltip="{{tooltipMessage}}" tooltip-position="{{tooltipPosition}}">
+    <i class="fa fa-tv" [ngClass]="largeIcon ? 'fa-2' : ''"></i>
     <span>{{pool.currentDedicated}}</span>
     <span *ngIf="pool.currentDedicated !== pool.targetDedicated">
         <span >⇾</span>
         <span>{{pool.targetDedicated}}</span>
     </span>
-</span>
+</div>
diff --git a/app/components/pool/details/error-display/index.ts b/app/components/pool/details/error-display/index.ts
new file mode 100644
index 0000000000..548e345b5a
--- /dev/null
+++ b/app/components/pool/details/error-display/index.ts
@@ -0,0 +1 @@
+export * from "./pool-error-display.component";
diff --git a/app/components/pool/details/pool-error-display.component.ts b/app/components/pool/details/error-display/pool-error-display.component.ts
similarity index 99%
rename from app/components/pool/details/pool-error-display.component.ts
rename to app/components/pool/details/error-display/pool-error-display.component.ts
index 507bcd6a93..f7fac67795 100644
--- a/app/components/pool/details/pool-error-display.component.ts
+++ b/app/components/pool/details/error-display/pool-error-display.component.ts
@@ -16,7 +16,6 @@ export class PoolErrorDisplayComponent {
     public pool: Pool;
 
     constructor(private poolService: PoolService, private accountService: AccountService) {
-
     }
 
     public get hasResizeError(): boolean {
diff --git a/app/components/pool/details/pool-error-display.html b/app/components/pool/details/error-display/pool-error-display.html
similarity index 100%
rename from app/components/pool/details/pool-error-display.html
rename to app/components/pool/details/error-display/pool-error-display.html
diff --git a/app/components/pool/details/index.ts b/app/components/pool/details/index.ts
index 21e2804d1a..06b711f7d6 100644
--- a/app/components/pool/details/index.ts
+++ b/app/components/pool/details/index.ts
@@ -1,5 +1,5 @@
+export * from "./error-display";
+export * from "./pool-configuration.component";
+export * from "./pool-default.component";
 export * from "./pool-details.component";
-export * from "./pool-details-home.component";
 export * from "./pool-details.module";
-export * from "./pool-error-display.component";
-export * from "./pool-properties.component";
diff --git a/app/components/pool/details/pool-properties.component.ts b/app/components/pool/details/pool-configuration.component.ts
similarity index 56%
rename from app/components/pool/details/pool-properties.component.ts
rename to app/components/pool/details/pool-configuration.component.ts
index 75122d6eae..9dba4aee8c 100644
--- a/app/components/pool/details/pool-properties.component.ts
+++ b/app/components/pool/details/pool-configuration.component.ts
@@ -1,20 +1,13 @@
-import { Component, Input,  OnDestroy, OnInit } from "@angular/core";
+import { Component, Input } from "@angular/core";
 
 import { Pool } from "app/models";
 import { PoolDecorator } from "app/models/decorators";
 
-// todo: put this template into a separate template file.
-// todo: ngFor to list properties. create a property collection below and bid it to the UI.
-// todo: directives for some of the more interesting property fields, like state that will show an icon.
-// todo: link properties, copy field properties.
-// todo: use moment for date formatting.
-// todo: pull in timespan and date formatting code from the portal.
-
 @Component({
-    selector: "bl-pool-properties",
-    templateUrl: "pool-properties.html",
+    selector: "bl-pool-configuration",
+    templateUrl: "pool-configuration.html",
 })
-export class PoolPropertiesComponent implements OnInit, /*OnChanges,*/ OnDestroy {
+export class PoolConfigurationComponent {
     @Input()
     public set pool(value: Pool) {
         this._pool = value;
@@ -26,13 +19,6 @@ export class PoolPropertiesComponent implements OnInit, /*OnChanges,*/ OnDestroy
 
     private _pool: Pool;
 
-    // TODO: Expose a 'status' input which can be used to control the loading
-    // TODO: state of the component
-
-    public ngOnInit() {
-        /* tab show */
-    }
-
     // /* @input parameter change */
     // public ngOnChanges() {
     //     if (this.poolId) {
@@ -51,8 +37,4 @@ export class PoolPropertiesComponent implements OnInit, /*OnChanges,*/ OnDestroy
     //         );
     //     }
     // }
-
-    public ngOnDestroy() {
-        /* tab hide */
-    }
 }
diff --git a/app/components/pool/details/pool-properties.html b/app/components/pool/details/pool-configuration.html
similarity index 94%
rename from app/components/pool/details/pool-properties.html
rename to app/components/pool/details/pool-configuration.html
index f841111139..fa82a24d27 100644
--- a/app/components/pool/details/pool-properties.html
+++ b/app/components/pool/details/pool-configuration.html
@@ -21,13 +21,13 @@
             <bl-text-property label="Url" [value]="decorator.url"></bl-text-property>
 		</bl-property-group>
 
-		<bl-property-group label="Cloud service configuration"  *ngIf="pool.cloudServiceConfiguration">
+		<bl-property-group label="Cloud service configuration" class="wide" [collapsed]="true" *ngIf="pool.cloudServiceConfiguration">
 			<bl-text-property label="OS family" [value]="decorator.cloudServiceConfiguration.osFamily"></bl-text-property>
 			<bl-text-property label="Curent OS version" [value]="decorator.cloudServiceConfiguration.currentOSVersion"></bl-text-property>
 			<bl-text-property label="Target OS version" [value]="decorator.cloudServiceConfiguration.targetOSVersion"></bl-text-property>
 		</bl-property-group>
 
-		<bl-property-group label="Virtual machine configuration" class="wide"  *ngIf="pool.virtualMachineConfiguration">
+		<bl-property-group label="Virtual machine configuration" class="wide" [collapsed]="true" *ngIf="pool.virtualMachineConfiguration">
 			<bl-text-property label="Publisher" [value]="decorator.virtualMachineConfiguration.imageReference.publisher"></bl-text-property>
 			<bl-text-property label="Offer" [value]="decorator.virtualMachineConfiguration.imageReference.offer"></bl-text-property>
             <bl-text-property label="Sku" [value]="decorator.virtualMachineConfiguration.imageReference.sku"></bl-text-property>
diff --git a/app/components/pool/details/pool-details-home.component.ts b/app/components/pool/details/pool-default.component.ts
similarity index 89%
rename from app/components/pool/details/pool-details-home.component.ts
rename to app/components/pool/details/pool-default.component.ts
index 64d95bbe2e..b165f86c2f 100644
--- a/app/components/pool/details/pool-details-home.component.ts
+++ b/app/components/pool/details/pool-default.component.ts
@@ -10,7 +10,7 @@ import { Component } from "@angular/core";
     `,
 })
 
-export class PoolDetailsHomeComponent {
+export class PoolDefaultComponent {
     public static breadcrumb() {
         return { name: "Pools" };
     }
diff --git a/app/components/pool/details/pool-details.html b/app/components/pool/details/pool-details.html
index ae03d093eb..7e91e3bedf 100644
--- a/app/components/pool/details/pool-details.html
+++ b/app/components/pool/details/pool-details.html
@@ -10,20 +10,10 @@
                     <md-card-subtitle>{{pool.vmSize}}, {{pool.allocationState}}</md-card-subtitle>
                 </div>
                 <div>
-                    <!--
-                        Want to add this but there is some recursive call or something going
-                        on in the getTooltip method causing stack overflows.
-                        Once we fix that, use the nodes-preview component instead
-
-                        This is tracked at https://github.com/angular/material2/issues/1157
-                        <bl-pool-nodes-preview [pool]="pool"></bl-pool-nodes-preview>
-                    -->
-                    <h4 [title]="nodesTooltipMessage">{{pool.currentDedicated}} / {{pool.targetDedicated}}</h4>
-                    <h5>Nodes</h5>
+                    <bl-pool-nodes-preview [pool]="pool" [largeIcon]="true"></bl-pool-nodes-preview>
                 </div>
             </md-card-title-group>
             <md-card-content>
-                <!-- TODO: Use Moment for date formatting -->
                 <p>Last resized {{lastResize}}</p>
                 <p><i class="fa fa-{{poolOsIcon}}" aria-hidden="true"></i> {{poolOs}}</p>
             </md-card-content>
@@ -41,22 +31,20 @@ <h5>Nodes</h5>
                     <bl-tab-label>Graphs</bl-tab-label>
                     <bl-pool-graphs [pool]="pool"></bl-pool-graphs>
                 </bl-tab>
+                <bl-tab key="configuration">
+                    <bl-tab-label>Configuration</bl-tab-label>
+                    <bl-pool-configuration [pool]="pool"></bl-pool-configuration>
+                </bl-tab>
+                <bl-tab key="startTask">
+                    <bl-tab-label>Start Task</bl-tab-label>
+                    <bl-start-task-properties [pool]="pool"></bl-start-task-properties>
+                </bl-tab>
                 <bl-tab key="nodes">
                     <bl-tab-label>Nodes</bl-tab-label>
                     <bl-entity-details-list #listWrapper [refresh]="list.refresh" [baseLink]="['/pools', poolId, 'nodes']" [filterPlaceholder]="filterPlaceholderText">
                         <bl-node-list #list [poolId]="poolId" [filter]="listWrapper.filter" [quickList]="false" [manualLoading]="true"></bl-node-list>
                     </bl-entity-details-list>
                 </bl-tab>
-                <bl-tab key="startTask">
-                    <bl-tab-label>Start Task</bl-tab-label>
-                    <div class="tab-padding">
-                        <bl-start-task-properties [pool]="pool"></bl-start-task-properties>
-                    </div>
-                </bl-tab>
-                <bl-tab key="properties">
-                    <bl-tab-label>Properties</bl-tab-label>
-                    <bl-pool-properties [pool]="pool"></bl-pool-properties>
-                </bl-tab>
             </bl-tab-group>
         </md-card>
     </div>
diff --git a/app/components/pool/details/pool-details.module.ts b/app/components/pool/details/pool-details.module.ts
index e1b355311c..091e009420 100644
--- a/app/components/pool/details/pool-details.module.ts
+++ b/app/components/pool/details/pool-details.module.ts
@@ -2,14 +2,18 @@ import { NgModule } from "@angular/core";
 
 import { commonModules } from "app/common";
 import { NodeBrowseModule } from "app/components/node/browse";
+import { PoolNodesPreviewComponent } from "app/components/pool/base/pool-nodes-preview.component";
+import { PoolErrorDisplayComponent } from "app/components/pool/details/error-display";
+import { PoolConfigurationComponent } from "app/components/pool/details/pool-configuration.component";
+import { PoolDefaultComponent } from "app/components/pool/details/pool-default.component";
+import { PoolDetailsComponent } from "app/components/pool/details/pool-details.component";
 import { PoolGraphsModule } from "app/components/pool/graphs";
 import { StartTaskModule } from "app/components/pool/start-task";
-import { PoolDetailsHomeComponent } from "./pool-details-home.component";
-import { PoolDetailsComponent } from "./pool-details.component";
-import { PoolErrorDisplayComponent } from "./pool-error-display.component";
-import { PoolPropertiesComponent } from "./pool-properties.component";
 
-const components = [PoolPropertiesComponent, PoolDetailsComponent, PoolDetailsHomeComponent, PoolErrorDisplayComponent];
+const components = [
+    PoolConfigurationComponent, PoolDefaultComponent, PoolDetailsComponent,
+    PoolErrorDisplayComponent, PoolNodesPreviewComponent,
+];
 
 @NgModule({
     declarations: components,
@@ -18,5 +22,4 @@ const components = [PoolPropertiesComponent, PoolDetailsComponent, PoolDetailsHo
         PoolGraphsModule, NodeBrowseModule, StartTaskModule],
 })
 export class PoolDetailsModule {
-
 }
diff --git a/app/components/pool/pool.module.ts b/app/components/pool/pool.module.ts
new file mode 100644
index 0000000000..a26510c3cc
--- /dev/null
+++ b/app/components/pool/pool.module.ts
@@ -0,0 +1,39 @@
+import { NgModule } from "@angular/core";
+
+import { commonModules } from "app/common";
+import { PoolAdvancedFilterComponent } from "app/components/pool/browse/filter";
+import { PoolListComponent } from "app/components/pool/browse/pool-list.component";
+import { PoolDetailsModule } from "app/components/pool/details";
+import { PoolGraphsModule } from "app/components/pool/graphs";
+import { PoolHomeComponent } from "app/components/pool/home/pool-home.component";
+import { StartTaskModule } from "app/components/pool/start-task";
+
+import {
+    DeletePoolDialogComponent,
+    PoolCreateBasicDialogComponent,
+    PoolOsPickerComponent,
+    PoolResizeDialogComponent,
+} from "app/components/pool/action";
+
+const components = [
+    DeletePoolDialogComponent, PoolAdvancedFilterComponent, PoolCreateBasicDialogComponent,
+    PoolHomeComponent, PoolListComponent, PoolOsPickerComponent,
+    PoolResizeDialogComponent,
+];
+
+const modules = [
+    PoolDetailsModule, PoolGraphsModule, StartTaskModule, ...commonModules,
+];
+
+@NgModule({
+    declarations: components,
+    exports: [...modules, ...components],
+    imports: [...modules],
+    entryComponents: [
+        DeletePoolDialogComponent,
+        PoolCreateBasicDialogComponent,
+        PoolResizeDialogComponent,
+    ],
+})
+export class PoolModule {
+}
diff --git a/app/components/pool/start-task/start-task-edit-form.html b/app/components/pool/start-task/start-task-edit-form.html
index fff8a3a1f0..09493607d6 100644
--- a/app/components/pool/start-task/start-task-edit-form.html
+++ b/app/components/pool/start-task/start-task-edit-form.html
@@ -1,5 +1,5 @@
 <div class="edit-form">
-    <h2>Edit start task for pool {{pool.id}}</h2>
+    <h2>Edit start task for pool: {{pool.id}}</h2>
     <bl-action-form [formGroup]="form" [submit]="submit" submitText="Update" (done)="close.emit()">
         <form novalidate [formGroup]="form">
             <bl-start-task-picker formControlName="startTask"></bl-start-task-picker>
diff --git a/app/components/pool/start-task/start-task-properties.html b/app/components/pool/start-task/start-task-properties.html
index 2673493f34..3882e342eb 100644
--- a/app/components/pool/start-task/start-task-properties.html
+++ b/app/components/pool/start-task/start-task-properties.html
@@ -1,40 +1,41 @@
-<div *ngIf="!edit" class="editable-properties">
-    <bl-property-list *ngIf="startTask">
-        <bl-property-group label="General" class="wide">
-            <bl-text-property label="Command line" [value]="startTask.commandLine"></bl-text-property>
-            <bl-text-property label="Max retry count" [value]="startTask.maxTaskRetryCount"></bl-text-property>
-            <bl-bool-property label="Run elevated" [value]="startTask.runElevated" YesNo="true"></bl-bool-property>
-            <bl-bool-property label="Wait for success" [value]="startTask.waitForSuccess" YesNo="true"></bl-bool-property>
+<button md-mini-fab color="primary" *ngIf="!edit" style="float:right; margin:20px;" (click)="edit = true" title="Edit start task">
+    <i class="fa fa-pencil"></i>
+</button>
 
-            <bl-table-property label="Resource files">
-                <bl-table-property-header>
-                    <div tp-column>Blob source</div>
-                    <div tp-column>File path</div>
-                </bl-table-property-header>
-                <bl-table-property-row *ngFor="let file of startTask.resourceFiles">
-                    <bl-tp-cell [value]="file.blobSource"></bl-tp-cell>
-                    <bl-tp-cell [value]="file.filePath"></bl-tp-cell>
-                </bl-table-property-row>
-            </bl-table-property>
-            <bl-table-property label="Environment settings">
-                <bl-table-property-header>
-                    <div tp-column>Key</div>
-                    <div tp-column>Value</div>
-                </bl-table-property-header>
-                <bl-table-property-row *ngFor="let setting of startTask.environmentSettings">
-                    <bl-tp-cell [value]="setting.key"></bl-tp-cell>
-                    <bl-tp-cell [value]="setting.value"></bl-tp-cell>
-                </bl-table-property-row>
-            </bl-table-property>
-        </bl-property-group>
-    </bl-property-list>
+<bl-property-list *ngIf="startTask && !edit">
+    <bl-property-group label="General" class="wide">
+        <bl-text-property label="Command line" [value]="startTask.commandLine"></bl-text-property>
+        <bl-text-property label="Max retry count" [value]="startTask.maxTaskRetryCount"></bl-text-property>
+        <bl-bool-property label="Run elevated" [value]="startTask.runElevated" YesNo="true"></bl-bool-property>
+        <bl-bool-property label="Wait for success" [value]="startTask.waitForSuccess" YesNo="true"></bl-bool-property>
 
-    <div *ngIf="!startTask" class="no-properties">
-        Pool doesn't have a start task
-    </div>
+        <bl-table-property label="Resource files">
+            <bl-table-property-header>
+                <div tp-column>Blob source</div>
+                <div tp-column>File path</div>
+            </bl-table-property-header>
+            <bl-table-property-row *ngFor="let file of startTask.resourceFiles">
+                <bl-tp-cell [value]="file.blobSource"></bl-tp-cell>
+                <bl-tp-cell [value]="file.filePath"></bl-tp-cell>
+            </bl-table-property-row>
+        </bl-table-property>
+        <bl-table-property label="Environment settings">
+            <bl-table-property-header>
+                <div tp-column>Key</div>
+                <div tp-column>Value</div>
+            </bl-table-property-header>
+            <bl-table-property-row *ngFor="let setting of startTask.environmentSettings">
+                <bl-tp-cell [value]="setting.key"></bl-tp-cell>
+                <bl-tp-cell [value]="setting.value"></bl-tp-cell>
+            </bl-table-property-row>
+        </bl-table-property>
+    </bl-property-group>
+</bl-property-list>
 
-    <button md-mini-fab color="primary" (click)="edit = true" mdTooltip="Edit">
-        <i class="fa fa-pencil"></i>
-    </button>
+<bl-no-item [itemCount]="startTask ? 1 : 0" *ngIf="!edit">
+    <span no-filter>This pool doesn't have a start task</span>
+</bl-no-item>
+
+<div class="tab-padding">
+    <bl-start-task-edit-form [pool]="pool" *ngIf="edit" (close)="edit=false"></bl-start-task-edit-form>
 </div>
-<bl-start-task-edit-form [pool]="pool" *ngIf="edit" (close)="edit=false"></bl-start-task-edit-form>
diff --git a/app/components/task/details/index.ts b/app/components/task/details/index.ts
index 08d763e46b..fe888dcf1e 100644
--- a/app/components/task/details/index.ts
+++ b/app/components/task/details/index.ts
@@ -1,9 +1,8 @@
-export * from "./no-task-selected.component";
+export * from "./task-configuration.component";
+export * from "./task-default.component";
 export * from "./task-details.component";
 export * from "./task-dependencies.component";
 export * from "./task-error-display.component";
 export * from "./task-details.module";
-export * from "./task-env-settings.component";
-export * from "./task-properties.component";
 export * from "./task-resource-files.component";
 export * from "./task-sub-tasks-tab.component";
diff --git a/app/components/task/details/task-properties.component.ts b/app/components/task/details/task-configuration.component.ts
similarity index 80%
rename from app/components/task/details/task-properties.component.ts
rename to app/components/task/details/task-configuration.component.ts
index dff1e68618..7edeea1446 100644
--- a/app/components/task/details/task-properties.component.ts
+++ b/app/components/task/details/task-configuration.component.ts
@@ -1,15 +1,15 @@
 import { ChangeDetectionStrategy, Component, Input } from "@angular/core";
 
-import { ExitOptions, Job, Task } from "app/models";
+import { ExitOptions, Job, NameValuePair, Task } from "app/models";
 import { TaskDecorator } from "app/models/decorators";
 import { JobAction, TaskFailureAction } from "app/models/job-action";
 
 @Component({
-    selector: "bl-task-properties",
-    templateUrl: "task-properties.html",
+    selector: "bl-task-configuration",
+    templateUrl: "task-configuration.html",
     changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class TaskPropertiesComponent {
+export class TaskConfigurationComponent {
     @Input()
     public job: Job;
 
@@ -21,13 +21,8 @@ export class TaskPropertiesComponent {
             this.hasEndTime = Boolean(this.task.executionInfo.endTime);
         }
 
-        this.decorator = new TaskDecorator(task);
-        this.appPackages = this.decorator.applicationPackageReferences || [];
-        this.constraints = this.decorator.constraints || {};
-        this.executionInfo = this.decorator.executionInfo || {};
-        this.nodeInfo = this.decorator.nodeInfo || {};
-
         this.processExitConditionData();
+        this._refresh(task);
     }
     public get task() { return this._task; }
 
@@ -36,6 +31,7 @@ export class TaskPropertiesComponent {
     public constraints: any;
     public executionInfo: any;
     public exitConditionData: any;
+    public environmentSettings: NameValuePair[] = [];
     public nodeInfo: any;
     public hasStartTime: boolean;
     public hasEndTime: boolean;
@@ -88,6 +84,18 @@ export class TaskPropertiesComponent {
         };
     }
 
+    private _refresh(task: Task) {
+        if (task) {
+            this.environmentSettings = task.environmentSettings || [];
+
+            this.decorator = new TaskDecorator(task);
+            this.appPackages = this.decorator.applicationPackageReferences || [];
+            this.constraints = this.decorator.constraints || {};
+            this.executionInfo = this.decorator.executionInfo || {};
+            this.nodeInfo = this.decorator.nodeInfo || {};
+        }
+    }
+
     private _jobActionString(exitOptions: ExitOptions) {
         if (!exitOptions) {
             return null;
diff --git a/app/components/task/details/task-properties.html b/app/components/task/details/task-configuration.html
similarity index 83%
rename from app/components/task/details/task-properties.html
rename to app/components/task/details/task-configuration.html
index 5f93e1e3fe..5a245e137d 100644
--- a/app/components/task/details/task-properties.html
+++ b/app/components/task/details/task-configuration.html
@@ -14,7 +14,10 @@
     </bl-property-group>
 
     <bl-property-group label="Application packages" class="wide" [collapsed]="true">
-        <bl-table-property label="Package references">
+        <div collapsed-preview>
+            <span>{{appPackages?.length}} application package reference</span>
+        </div>
+        <bl-table-property *ngIf="appPackages.length > 0" label="Package references">
             <bl-table-property-header>
                 <div tp-column>Application</div>
                 <div tp-column>Version</div>
@@ -24,6 +27,9 @@
                 <bl-tp-cell [value]="package.version"></bl-tp-cell>
             </bl-table-property-row>
         </bl-table-property>
+        <bl-no-item [itemCount]="appPackages.length" [slimline]="true">
+            <span no-filter>This task contains no application package references</span>
+        </bl-no-item>
     </bl-property-group>
 
     <bl-property-group label="Compute node" class="wide" [collapsed]="true">
@@ -41,6 +47,16 @@
         <bl-text-property label="Retention time" [value]="constraints.retentionTime"></bl-text-property>
     </bl-property-group>
 
+    <bl-property-group label="Environment settings" class="wide" [collapsed]="true">
+        <div collapsed-preview>
+            <span>{{environmentSettings?.length}} environment settings</span>
+        </div>
+        <bl-text-property *ngFor="let setting of environmentSettings" label="{{setting.name}}" [value]="setting.value"></bl-text-property>
+        <bl-no-item [itemCount]="environmentSettings.length" [slimline]="true">
+            <span no-filter>This task contains no environment settings</span>
+        </bl-no-item>
+    </bl-property-group>
+
     <bl-property-group label="Execution information" class="wide" [collapsed]="true">
         <div collapsed-preview>
             <span *ngIf="!hasStartTime">Task not started</span>
diff --git a/app/components/task/details/no-task-selected.component.ts b/app/components/task/details/task-default.component.ts
similarity index 90%
rename from app/components/task/details/no-task-selected.component.ts
rename to app/components/task/details/task-default.component.ts
index de9823cfd7..f38c82b8aa 100644
--- a/app/components/task/details/no-task-selected.component.ts
+++ b/app/components/task/details/task-default.component.ts
@@ -9,7 +9,7 @@ import { Component } from "@angular/core";
         </div>
     `,
 })
-export class NoTaskSelectedComponent {
+export class TaskDefaultComponent {
     public static breadcrumb(params, queryParams) {
         return { name: "Tasks" };
     }
diff --git a/app/components/task/details/task-details.html b/app/components/task/details/task-details.html
index 0da27c75a4..7f4b01d00e 100644
--- a/app/components/task/details/task-details.html
+++ b/app/components/task/details/task-details.html
@@ -11,7 +11,7 @@
                             <bl-refresh-btn [refresh]="refresh"></bl-refresh-btn>
                         </div>
                         <div style="margin-left:12px; margin-right:auto;">
-                            <md-card-title>{{task.id}} <span *ngIf="!!task.displayName"> - {{task.displayName}} - {{taskId}}</span> </md-card-title>
+                            <md-card-title>{{task.id}} <span *ngIf="!!task.displayName"> - {{task.displayName}}</span> </md-card-title>
                             <md-card-subtitle><i class="fa" [ngClass]="decorator.stateIcon"></i> {{task.state}}</md-card-subtitle>
                         </div>
                     </md-card-title-group>
@@ -38,15 +38,9 @@
                         <bl-task-output [jobId]="jobId" [task]="task"></bl-task-output>
                     </div>
                 </bl-tab>
-                <bl-tab key="properties">
-                    <bl-tab-label>Properties</bl-tab-label>
-                    <bl-task-properties [job]="job" [task]="task"></bl-task-properties>
-                </bl-tab>
-                <bl-tab key="envs">
-                    <bl-tab-label>Environment Settings</bl-tab-label>
-                    <div class="tab-padding">
-                        <bl-task-environment-settings [task]="task"></bl-task-environment-settings>
-                    </div>
+                <bl-tab key="configuration">
+                    <bl-tab-label>Configuration</bl-tab-label>
+                    <bl-task-configuration [job]="job" [task]="task"></bl-task-configuration>
                 </bl-tab>
                 <bl-tab key="resource-files">
                     <bl-tab-label>Resource Files</bl-tab-label>
diff --git a/app/components/task/details/task-details.module.ts b/app/components/task/details/task-details.module.ts
index acdaef8b19..46137598b0 100644
--- a/app/components/task/details/task-details.module.ts
+++ b/app/components/task/details/task-details.module.ts
@@ -5,23 +5,22 @@ import { FileBrowseModule } from "app/components/file/browse";
 import { FileDetailsModule } from "app/components/file/details";
 import { TaskBrowseModule } from "app/components/task/browse";
 
-import { NoTaskSelectedComponent } from "./no-task-selected.component";
 import { TaskOutputComponent } from "./output";
 import { SubTaskDisplayListComponent, SubTaskPropertiesComponent } from "./sub-tasks";
+import { TaskConfigurationComponent } from "./task-configuration.component";
+import { TaskDefaultComponent } from "./task-default.component";
 import { TaskDependenciesComponent } from "./task-dependencies.component";
 import { TaskDetailsComponent } from "./task-details.component";
-import { TaskEnvironmentSettingsComponent } from "./task-env-settings.component";
 import { TaskErrorDisplayComponent } from "./task-error-display.component";
-import { TaskPropertiesComponent } from "./task-properties.component";
 import { TaskResourceFilesComponent } from "./task-resource-files.component";
 import { TaskSubTasksTabComponent } from "./task-sub-tasks-tab.component";
 import { TaskTimelineComponent, TaskTimelineStateComponent } from "./task-timeline";
 
 const components = [
-    TaskTimelineComponent, TaskTimelineStateComponent, NoTaskSelectedComponent,
-    TaskDependenciesComponent, TaskDetailsComponent, TaskOutputComponent,
-    TaskEnvironmentSettingsComponent, TaskPropertiesComponent, TaskResourceFilesComponent, TaskSubTasksTabComponent,
-    SubTaskPropertiesComponent, SubTaskDisplayListComponent, TaskErrorDisplayComponent,
+    SubTaskDisplayListComponent, SubTaskPropertiesComponent, TaskConfigurationComponent,
+    TaskDefaultComponent, TaskDependenciesComponent, TaskDetailsComponent, TaskOutputComponent,
+    TaskResourceFilesComponent, TaskSubTasksTabComponent, TaskTimelineComponent, TaskTimelineStateComponent,
+    TaskErrorDisplayComponent,
 ];
 
 @NgModule({
diff --git a/app/components/task/details/task-env-settings.component.ts b/app/components/task/details/task-env-settings.component.ts
deleted file mode 100644
index 65af4cfbe8..0000000000
--- a/app/components/task/details/task-env-settings.component.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { Component, Input, ViewContainerRef } from "@angular/core";
-import { NameValuePair, Task } from "app/models";
-
-@Component({
-    selector: "bl-task-environment-settings",
-    templateUrl: "task-env-settings.html",
-})
-export class TaskEnvironmentSettingsComponent {
-    @Input()
-    public set task(task: Task) {
-        this._task = task;
-        this.refresh(task);
-    }
-    public get task() { return this._task; }
-
-    public environmentSettings: NameValuePair[] = [];
-
-    private _task: Task;
-
-    constructor(
-        private viewContainerRef: ViewContainerRef) {
-    }
-
-    public refresh(task: Task) {
-        if (this.task) {
-            this.environmentSettings = this.task.environmentSettings || [];
-        }
-    }
-}
diff --git a/app/components/task/details/task-env-settings.html b/app/components/task/details/task-env-settings.html
deleted file mode 100644
index 55a7b5339b..0000000000
--- a/app/components/task/details/task-env-settings.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<bl-property-list>
-    <bl-property-group label="Environment settings" class="wide">
-        <bl-text-property *ngFor="let setting of environmentSettings" label="{{setting.name}}" [value]="setting.value"></bl-text-property>
-    </bl-property-group>
-</bl-property-list>
-<bl-no-item [itemCount]="environmentSettings.length">
-    <span no-filter>This task contains no environment settings</span>
-</bl-no-item>
diff --git a/app/components/task/task.module.ts b/app/components/task/task.module.ts
new file mode 100644
index 0000000000..8a15927be9
--- /dev/null
+++ b/app/components/task/task.module.ts
@@ -0,0 +1,37 @@
+import { NgModule } from "@angular/core";
+
+import { commonModules } from "app/common";
+import { TaskBaseModule } from "app/components/task/base";
+import { TaskBrowseModule } from "app/components/task/browse";
+import { TaskDetailsModule } from "app/components/task/details";
+import { TaskHomeComponent } from "app/components/task/home";
+
+import {
+    DeleteTaskDialogComponent,
+    RerunTaskFormComponent,
+    TaskCreateBasicDialogComponent,
+    TerminateTaskDialogComponent,
+} from "app/components/task/action";
+
+const components = [
+    TaskHomeComponent, DeleteTaskDialogComponent, RerunTaskFormComponent, TaskCreateBasicDialogComponent,
+    TerminateTaskDialogComponent,
+];
+
+const modules = [
+    TaskBaseModule, TaskBrowseModule, TaskDetailsModule, ...commonModules,
+];
+
+@NgModule({
+    declarations: components,
+    exports: [...modules, ...components],
+    imports: [...modules],
+    entryComponents: [
+        DeleteTaskDialogComponent,
+        RerunTaskFormComponent,
+        TaskCreateBasicDialogComponent,
+        TerminateTaskDialogComponent,
+    ],
+})
+export class TaskModule {
+}