diff --git a/extensions/agent/src/dialogs/operatorDialog.ts b/extensions/agent/src/dialogs/operatorDialog.ts
index 89b44d50f6..7d407dfa29 100644
--- a/extensions/agent/src/dialogs/operatorDialog.ts
+++ b/extensions/agent/src/dialogs/operatorDialog.ts
@@ -96,12 +96,21 @@ export class OperatorDialog extends AgentDialog<OperatorData> {
 	private initializeGeneralTab() {
 		this.generalTab.registerContent(async view => {
 
-			this.nameTextBox = view.modelBuilder.inputBox().component();
+			this.nameTextBox = view.modelBuilder.inputBox().withProperties({
+				ariaLabel: OperatorDialog.NameLabel,
+				placeHolder: OperatorDialog.NameLabel
+			}).component();
 			this.nameTextBox.value = this.model.name;
-			this.emailNameTextBox = view.modelBuilder.inputBox().component();
+			this.emailNameTextBox = view.modelBuilder.inputBox().withProperties({
+				ariaLabel: OperatorDialog.EmailNameTextLabel,
+				placeHolder: OperatorDialog.EmailNameTextLabel
+			}).component();
 			this.emailNameTextBox.value = this.model.emailAddress;
 
-			this.pagerEmailNameTextBox = view.modelBuilder.inputBox().component();
+			this.pagerEmailNameTextBox = view.modelBuilder.inputBox().withProperties({
+				ariaLabel: OperatorDialog.PagerEmailNameTextLabel,
+				placeHolder: OperatorDialog.PagerEmailNameTextLabel
+			}).component();
 			this.pagerEmailNameTextBox.value = this.model.pagerAddress;
 
 			this.enabledCheckBox = view.modelBuilder.checkBox()
diff --git a/src/sql/workbench/parts/jobManagement/electron-browser/jobHistory.component.html b/src/sql/workbench/parts/jobManagement/electron-browser/jobHistory.component.html
index d47a2986bc..c5982767a1 100644
--- a/src/sql/workbench/parts/jobManagement/electron-browser/jobHistory.component.html
+++ b/src/sql/workbench/parts/jobManagement/electron-browser/jobHistory.component.html
@@ -10,8 +10,8 @@
 </div>
 
 <!-- Back -->
-<div class="all-jobs">
-	<div class="back-button-icon" (click)="goToJobs()"></div>All Jobs
+<div class="all-jobs" tabindex="0" (click)="goToJobs()" (keyup.enter)="goToJobs()">
+	<div class="back-button-icon" (click)="goToJobs()" (keyup.enter)="goToJobs()"></div>All Jobs
 </div>
 
 <!-- Actions -->
diff --git a/src/sql/workbench/parts/jobManagement/electron-browser/jobStepsView.component.ts b/src/sql/workbench/parts/jobManagement/electron-browser/jobStepsView.component.ts
index c319fc2520..3779b717c8 100644
--- a/src/sql/workbench/parts/jobManagement/electron-browser/jobStepsView.component.ts
+++ b/src/sql/workbench/parts/jobManagement/electron-browser/jobStepsView.component.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import 'vs/css!./media/jobStepsView';
-
+import * as nls from 'vs/nls';
 import * as dom from 'vs/base/browser/dom';
 import { OnInit, Component, Inject, forwardRef, ElementRef, ChangeDetectorRef, ViewChild, AfterContentChecked } from '@angular/core';
 import { attachListStyler } from 'vs/platform/theme/common/styler';
@@ -105,6 +105,8 @@ export class JobStepsViewComponent extends JobManagementView implements OnInit,
 			renderer: this._treeRenderer
 		}, { verticalScrollMode: ScrollbarVisibility.Visible, horizontalScrollMode: ScrollbarVisibility.Visible });
 		this._register(attachListStyler(this._tree, this.themeService));
+		const stepsTooltip = nls.localize('agent.steps', 'Steps');
+		jQuery('.steps-header > .steps-icon').attr('title', stepsTooltip);
 		this._telemetryService.publicLog(TelemetryKeys.JobStepsView);
 	}
 
diff --git a/src/sql/workbench/parts/jobManagement/electron-browser/media/jobHistory.css b/src/sql/workbench/parts/jobManagement/electron-browser/media/jobHistory.css
index f924199f0c..4a8708a20d 100644
--- a/src/sql/workbench/parts/jobManagement/electron-browser/media/jobHistory.css
+++ b/src/sql/workbench/parts/jobManagement/electron-browser/media/jobHistory.css
@@ -6,7 +6,9 @@
 
 jobhistory-component .all-jobs {
 	display: inline-block;
+	cursor: pointer;
 	font-size: 15px;
+	width: 10%;
 }
 
 .overview-container .overview-tab .resultsViewCollapsible {