diff --git a/src/app/staticanalysis/staticAnalysisView.js b/src/app/staticanalysis/staticAnalysisView.js
index 699387b61a..b8f00c468f 100644
--- a/src/app/staticanalysis/staticAnalysisView.js
+++ b/src/app/staticanalysis/staticAnalysisView.js
@@ -43,32 +43,32 @@ staticAnalysisView.prototype.render = function () {
   var self = this
   var view = yo`
     <div class="${css.analysis}">
-      <div id="staticanalysismodules" class="list-group list-group-flush">
-        ${this.modulesView}
-      </div>
       <div class="${css.buttons}">
-        <div class="${css.buttonsInner}">
-          <button class="${css.buttonRun} btn btn-sm btn-primary" onclick="${function () { self.run() }}" >Run</button>
-          <label class="${css.label}" for="autorunstaticanalysis">
-            <input id="autorunstaticanalysis"
-              type="checkbox"
-              style="vertical-align:bottom"
-              checked="true"
-            >
-            Auto run
-          </label>
-          <label class="${css.label}" for="checkAllEntries">
-            <input id="checkAllEntries"
-              type="checkbox"
-              onclick="${function (event) { self.checkAll(event) }}"
-              style="vertical-align:bottom"
-              checked="true"
-            >
-            Check/Uncheck all
-          </label>
+          <div class="${css.buttonsInner}">
+            <button class="${css.buttonRun} btn btn-sm btn-primary" onclick="${function () { self.run() }}" >Run</button>
+            <label class="${css.label}" for="autorunstaticanalysis">
+              <input id="autorunstaticanalysis"
+                type="checkbox"
+                style="vertical-align:bottom"
+                checked="true"
+              >
+              Auto run
+            </label>
+            <label class="${css.label}" for="checkAllEntries">
+              <input id="checkAllEntries"
+                type="checkbox"
+                onclick="${function (event) { self.checkAll(event) }}"
+                style="vertical-align:bottom"
+                checked="true"
+              >
+              Check/Uncheck all
+            </label>
+          </div>
         </div>
-      </div>
-      <div class="${css.result}" "id='staticanalysisresult'></div>
+        <div id="staticanalysismodules" class="list-group list-group-flush ${css.container}">
+          ${this.modulesView}
+        </div>      
+        <div class="${css.result}" "id='staticanalysisresult'></div>
     </div>
   `
   if (!this.view) {
@@ -96,8 +96,8 @@ staticAnalysisView.prototype.run = function () {
   var selected = this.selectedModules()
   var warningContainer = $('#staticanalysisresult')
   warningContainer.empty()
+  var self = this
   if (this.lastCompilationResult) {
-    var self = this
     var warningCount = 0
     this.runner.run(this.lastCompilationResult, selected, function (results) {
       results.map(function (result, i) {
diff --git a/src/app/staticanalysis/styles/staticAnalysisView-styles.js b/src/app/staticanalysis/styles/staticAnalysisView-styles.js
index 4aa5f5450a..65b241178a 100644
--- a/src/app/staticanalysis/styles/staticAnalysisView-styles.js
+++ b/src/app/staticanalysis/styles/staticAnalysisView-styles.js
@@ -25,6 +25,10 @@ var css = csjs`
     display: flex;
     align-items: center;
   }
+  .container {
+    max-height: 500px;
+    overflow-y: auto;
+  }
 `
 
 module.exports = css
diff --git a/src/app/ui/styles/renderer-styles.js b/src/app/ui/styles/renderer-styles.js
index 710d7fb821..2a143a165a 100644
--- a/src/app/ui/styles/renderer-styles.js
+++ b/src/app/ui/styles/renderer-styles.js
@@ -49,7 +49,7 @@ var css = yo`<style>
 }
 
 .sol.staticAnalysisWarning {
-  background-color: var(--info);
+  background-color: var(--warning);
 }
 
 .sol.success {