diff --git a/awx/ui/static/js/controllers/JobStdout.js b/awx/ui/static/js/controllers/JobStdout.js
index 04a6ddfe55..c2f832acf9 100644
--- a/awx/ui/static/js/controllers/JobStdout.js
+++ b/awx/ui/static/js/controllers/JobStdout.js
@@ -15,7 +15,7 @@ export function JobStdoutController ($location, $log, $rootScope, $scope, $compi
 
     ClearScope();
 
-    var available_height, job_id = $routeParams.id,
+    var job_id = $routeParams.id,
         api_complete = false,
         stdout_url,
         current_range,
@@ -137,17 +137,6 @@ export function JobStdoutController ($location, $log, $rootScope, $scope, $compi
         return  direction;
     }
 
-    function resizeToFit() {
-        available_height = $(window).height() - $('#main-menu-container .navbar').outerHeight() - $('#job-status').outerHeight() -
-            $('#breadcrumb-container').outerHeight() - 60;
-        $('#pre-container').height(available_height);
-    }
-    resizeToFit();
-
-    $(window).resize(_.debounce(function() {
-        resizeToFit();
-    }, 500));
-
     $('#pre-container').bind('scroll', function() {
         if (detectDirection() === "up") {
             should_apply_live_events = false;
@@ -264,7 +253,7 @@ export function JobStdoutController ($location, $log, $rootScope, $scope, $compi
         Rest.setUrl(url);
         Rest.get()
             .success( function(data) {
-                if ($('#pre-container-content').html() === "stdout capture pending") {
+                if ($('#pre-container-content').html() === "Waiting for results...") {
                     $('#pre-container-content').html(data.content);
                 } else {
                     $('#pre-container-content').append(data.content);
diff --git a/awx/ui/static/less/ansible-ui.less b/awx/ui/static/less/ansible-ui.less
index 20ae33f979..5d3785dadb 100644
--- a/awx/ui/static/less/ansible-ui.less
+++ b/awx/ui/static/less/ansible-ui.less
@@ -1976,3 +1976,11 @@ tr td button i {
 .nvd3 g.nv-groups path.nv-line {
   stroke-width: 3px;
 }
+
+.stdout-panel-body {
+    background-color: #e9e9e9;
+}
+
+.job-stdout-panel {
+    margin: 0 15px;
+}
diff --git a/awx/ui/static/partials/job_stdout.html b/awx/ui/static/partials/job_stdout.html
index e6790e7d0f..b2f4785211 100644
--- a/awx/ui/static/partials/job_stdout.html
+++ b/awx/ui/static/partials/job_stdout.html
@@ -13,17 +13,33 @@
                 <button type="button" class="btn btn-xs btn-primary ng-hide" ng-click="refresh()" id="refresh_btn" aw-tool-tip="Refresh the page" data-placement="top" ng-show="socketStatus == 'error'" data-original-title="" title=""><i class="fa fa-refresh fa-lg"></i> </button></div>
             </div>
         </div>
-
         <div class="row">
             <div class="col-md-12">
                 <div id="job-status"><label>Job Status</label> <i class="fa icon-job-{{ job.status }}"></i> {{ job.status }}</div>
-                <div class="scroll-spinner" id="stdoutMoreRowsTop"><i class="fa fa-cog fa-spin"></i></div>
-                <div id="pre-container" class="body_background body_foreground pre mono-space" lr-infinite-scroll="stdOutScrollToTop"
-                    scroll-threshold="300" data-direction="up" time-threshold="500">
-                    <div id="pre-container-content"></div>
-                </div>
             </div>
-            <div class="scroll-spinner" id="stdoutMoreRowsBottom"><i class="fa fa-cog fa-spin"></i></div>
+            <div class="panel panel-default job-stdout-panel">
+              <div class="panel-heading">
+                <h3 class="panel-title">{{ job.name }} standard out</h3>
+              </div>
+              <div class="panel-body stdout-panel-body">
+                  <div class="row">
+                      <div class="col-md-12">
+                          <div class="scroll-spinner" id="stdoutMoreRowsTop">
+                              <i class="fa fa-cog fa-spin"></i>
+                          </div>
+                          <div id="pre-container" class="body_background
+                              body_foreground pre mono-space"
+                              lr-infinite-scroll="stdOutScrollToTop"
+                              scroll-threshold="300" data-direction="up" time-threshold="500">
+                              <div id="pre-container-content"></div>
+                          </div>
+                      </div>
+                      <div class="scroll-spinner" id="stdoutMoreRowsBottom">
+                          <i class="fa fa-cog fa-spin"></i>
+                      </div>
+                  </div>
+              </div>
+            </div>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/awx/ui/static/partials/job_stdout_adhoc.html b/awx/ui/static/partials/job_stdout_adhoc.html
index 5db43247ce..6790efb4d0 100644
--- a/awx/ui/static/partials/job_stdout_adhoc.html
+++ b/awx/ui/static/partials/job_stdout_adhoc.html
@@ -8,7 +8,7 @@
                     <li><a href="/#/jobs">Jobs</a></li>
                     <li class="active">
                         <a href="/#/ad_hoc_commands/{{ job.id }}">
-                            {{ job.id }} - {{ job.name }} standard out
+                            {{ job.id }} - {{ job.name }}
                         </a>
                     </li>
                 </ul>
@@ -144,21 +144,28 @@
             </div>
         </div>
 
-        <div class="row">
-            <div class="col-md-12">
-                <div class="scroll-spinner" id="stdoutMoreRowsTop">
-                    <i class="fa fa-cog fa-spin"></i>
-                </div>
-                <div id="pre-container" class="body_background
-                    body_foreground pre mono-space"
-                    lr-infinite-scroll="stdOutScrollToTop"
-                    scroll-threshold="300" data-direction="up" time-threshold="500">
-                    <div id="pre-container-content"></div>
-                </div>
-            </div>
-            <div class="scroll-spinner" id="stdoutMoreRowsBottom">
-                <i class="fa fa-cog fa-spin"></i>
-            </div>
+        <div class="panel panel-default">
+          <div class="panel-heading">
+            <h3 class="panel-title">{{ job.name }} standard out</h3>
+          </div>
+          <div class="panel-body stdout-panel-body">
+              <div class="row">
+                  <div class="col-md-12">
+                      <div class="scroll-spinner" id="stdoutMoreRowsTop">
+                          <i class="fa fa-cog fa-spin"></i>
+                      </div>
+                      <div id="pre-container" class="body_background
+                          body_foreground mono-space"
+                          lr-infinite-scroll="stdOutScrollToTop"
+                          scroll-threshold="300" data-direction="up" time-threshold="500">
+                          <div id="pre-container-content"></div>
+                      </div>
+                  </div>
+                  <div class="scroll-spinner" id="stdoutMoreRowsBottom">
+                      <i class="fa fa-cog fa-spin"></i>
+                  </div>
+              </div>
+          </div>
         </div>
 
     </div>