diff --git a/app/server-control/controllers/remote-console-controller.html b/app/server-control/controllers/remote-console-controller.html
index d26ebbe..3011eb0 100644
--- a/app/server-control/controllers/remote-console-controller.html
+++ b/app/server-control/controllers/remote-console-controller.html
@@ -9,7 +9,11 @@
 	</section>
 	<section class="row column">
 		<p class="serial-lan__copy">The Serial over LAN (SoL) console redirects the output of the server’s serial port to a browser window on your workstation.</p>
-		<serial-console show-tab-btn="true"></serial-console>
+	</section>
+	<section class="row column">
+		<div class="terminal-container">
+			<serial-console show-tab-btn="true"></serial-console>
+		</div>
 	</section>
 </div>
 
diff --git a/app/server-control/controllers/remote-console-window-controller.html b/app/server-control/controllers/remote-console-window-controller.html
index eca7bec..bde520d 100644
--- a/app/server-control/controllers/remote-console-window-controller.html
+++ b/app/server-control/controllers/remote-console-window-controller.html
@@ -1,5 +1,7 @@
 <div class="serial-lan__header">
 	<a class="bold" ng-click="close()"><i class="icon icon__return"></i> Return to OpenBmc</a>
 </div>
-<serial-console show-tab-btn="false"></serial-console>
+<div class="window-terminal-container">
+	<serial-console show-tab-btn="false"></serial-console>
+</div>
 
diff --git a/app/server-control/styles/remote-console.scss b/app/server-control/styles/remote-console.scss
index c4dd9ac..41b144d 100644
--- a/app/server-control/styles/remote-console.scss
+++ b/app/server-control/styles/remote-console.scss
@@ -8,16 +8,6 @@
 .serial-lan__copy {
   padding: 1em 0;
 }
-.serial-lan__terminal {
-  position: relative;
-  width: 101%; //extra 1% to fix redraw issue with terminal window
-  height: 400px;
-  border: 1em solid #19273c;
-  //TODO: Need to move from hterm to xterm as iframe used is adding the extra
-  //scroll bar. Also need to rework on the height setting along with $window
-  //directive.
-  overflow-x: hidden;
-}
 
 .serial-lan__actions {
   float: right;
@@ -40,3 +30,15 @@
   line-height: 0;
   a {color: $black;}
 }
+
+.terminal-container {
+  position: relative;
+  height: 25em;
+  width: 100%;
+}
+
+.window-terminal-container {
+  position: relative;
+  height: 25em;
+  max-width: 70em;
+}