diff --git a/src/sql/parts/modelComponents/declarativeTable.component.ts b/src/sql/parts/modelComponents/declarativeTable.component.ts
index 8eb1c6f8d4..795f8f1141 100644
--- a/src/sql/parts/modelComponents/declarativeTable.component.ts
+++ b/src/sql/parts/modelComponents/declarativeTable.component.ts
@@ -32,18 +32,15 @@ export enum DeclarativeDataType {
 @Component({
 	selector: 'modelview-declarativeTable',
 	template: `
-	<table role=grid aria-labelledby="ID_REF" #container *ngIf="columns" class="declarative-table">
+	<table role=grid aria-labelledby="ID_REF" #container *ngIf="columns" class="declarative-table" [style.height]="getHeight()">
 	<thead>
-        <tr style="display:block;">
 		<ng-container *ngFor="let column of columns;let h = index">
-            <td class="declarative-table-header" tabindex="-1" [style.width]="getColumnWidth(h)" role="button" aria-sort="none">{{column.displayName}}</td>
+		<th class="declarative-table-header" tabindex="-1" role="button" aria-sort="none">{{column.displayName}}</th>
 		</ng-container>
-		</tr>
     </thead>
 		<ng-container *ngIf="data">
-		<tbody style="display: block; width:100%; overflow-y: scroll" [style.height]="getHeight()">
 			<ng-container *ngFor="let row of data;let r = index">
-				<tr class="declarative-table-row">
+				<tr class="declarative-table-row" >
 					<ng-container *ngFor="let cellData of row;let c = index">
 						<td class="declarative-table-cell" tabindex="-1" role="button" [style.width]="getColumnWidth(c)">
 							<checkbox *ngIf="isCheckBox(c)" label="" (onChange)="onCheckBoxChanged($event,r,c)" [enabled]="isControlEnabled(c)" [checked]="isChecked(r,c)"></checkbox>
@@ -54,9 +51,7 @@ export enum DeclarativeDataType {
 						</td>
 					</ng-container>
 				</tr>
-
 			</ng-container>
-			</tbody>
 		</ng-container>
 	</table>
 	`
diff --git a/src/sql/sqlops.proposed.d.ts b/src/sql/sqlops.proposed.d.ts
index dbf1271bfd..77cc5537bb 100644
--- a/src/sql/sqlops.proposed.d.ts
+++ b/src/sql/sqlops.proposed.d.ts
@@ -715,7 +715,7 @@ declare module 'sqlops' {
 				 * Register model view content for the dialog.
 				 * Doesn't do anything if model view is already registered
 				 */
-				registerContent(handler: (view: ModelView) => void): void;
+				registerContent(handler: (view: ModelView) => Thenable<void>): void;
 
 				/**
 				 * Returns the model view content if registered. Returns undefined if model review is not registered
diff --git a/src/sql/workbench/api/node/extHostModelViewDialog.ts b/src/sql/workbench/api/node/extHostModelViewDialog.ts
index 4fee53d9f0..36ecb4019e 100644
--- a/src/sql/workbench/api/node/extHostModelViewDialog.ts
+++ b/src/sql/workbench/api/node/extHostModelViewDialog.ts
@@ -36,7 +36,7 @@ class ModelViewPanelImpl implements sqlops.window.modelviewdialog.ModelViewPanel
 		this._onValidityChanged(valid => this._valid = valid);
 	}
 
-	public registerContent(handler: (view: sqlops.ModelView) => void): void {
+	public registerContent(handler: (view: sqlops.ModelView) => Thenable<void>): void {
 		if (!this._modelViewId) {
 			let viewId = this._viewType + this._handle;
 			this.setModelViewId(viewId);