diff --git a/dmn-verifier-app/src/main/webapp/index.xhtml b/dmn-verifier-app/src/main/webapp/index.xhtml
index a10f255dfd4aec815931220e49c2ec01e7d67b9d..9a9a8d074ae8c3e04718a27b7f8427ecbbc61912 100644
--- a/dmn-verifier-app/src/main/webapp/index.xhtml
+++ b/dmn-verifier-app/src/main/webapp/index.xhtml
@@ -38,151 +38,135 @@
                 <script src="js/dmnViewer.js"></script>
             </h:panelGroup>
 
-            <h:form>
-                <p:commandButton value="Verify"
-                                 id="verify-button"
-                                 styleClass="dmn-button"
-                                 onclick="exportDiagram()"
-                                 action="#{buttonBean.validateDmn}"
-                                 update="content"
-                                 disabled="#{buttonBean.disabled}"/>
-
-                <!--
-                <p:selectBooleanCheckbox value="#{buttonBean.calculateMultiTable}"
-                                         disabled="#{buttonBean.disabled}"
-                                         itemLabel="Calculate Multi Table"/>
-                -->
-                <p:commandButton value="Empty DMN"
-                                 id="clear-button"
-                                 styleClass="dmn-button"
-                                 action="#{buttonBean.setEmptyDmn}"
-                                 update="content"
-                                 ajax="true"/>
-
-                <p:commandButton value="Sample DMN"
-                                 id="sample-button"
-                                 styleClass="dmn-button"
-                                 action="#{buttonBean.setSampleDmn}"
-                                 update="content"
-                                 ajax="true"/>
-
-                <p:commandButton value="Sample Multi"
-                                 id="sample2-button"
-                                 styleClass="dmn-button"
-                                 action="#{buttonBean.setSampleMultiDmn}"
-                                 update="content"
-                                 ajax="true"/>
-
-                <p:commandButton value="Download"
-                                 id="download-button"
-                                 styleClass="dmn-button"
-                                 onclick="exportDiagram()"
-                                 ajax="false"
-                                 disabled="#{buttonBean.disabled}">
-                    <p:fileDownload value="#{buttonBean.downloadDmn}"/>
-                </p:commandButton>
-            </h:form>
-            <!-- Single Table -->
-            <p:ajaxStatus style="display:block;">
-                <f:facet name="default">
-                </f:facet>
-
-                <f:facet name="start">
-                    <p:graphicImage style="margin-left: 20px;" name="img/Spinner.gif"/>
-                </f:facet>
-
-                <f:facet name="complete">
-                    <h2>Single table results</h2>
-                    <p:dataTable var="verifier"
-                                 value="#{tableDataBean.verifierResultListSingleTables}"
-                                 emptyMessage="No records found, check syntax!">
-                        <p:column style="width:16px">
-                            <p:rowToggler/>
-                        </p:column>
-
-                        <p:column styleClass="col-dataType" headerText="Type">
-                            <h:outputText value="#{verifier.verifierType}"/>
-                        </p:column>
-
-                        <p:column styleClass="col-description" headerText="Description">
-                            <h:outputText value="#{verifier.verificationDescription}"/>
-                        </p:column>
-
-                        <p:column styleClass="col-quantity" headerText="Quantity">
-                            <h:outputText value="#{verifier.verificationsCount}"/>
-                        </p:column>
-
-                        <p:rowExpansion>
-                            <p:dataTable var="results" value="#{verifier.verifications}">
-                                <p:column styleClass="subcol-message" headerText="Message">
-                                    <h:outputText value="#{results.message}"/>
-                                </p:column>
-                                <p:column styleClass="subcol-rules" headerText="Rules">
-                                    <h:panelGroup rendered="#{not verifier.multiTable}">
-                                        <p:commandButton styleClass="ruleselect-button"
-                                                         style="width: 95%;"
-                                                         onclick="addHighlightCss(#{results.rulesAsJson});"
-                                                         value="Show"/>
-                                    </h:panelGroup>
-                                    <h:panelGroup rendered="#{verifier.multiTable}">
-                                        <p:dataTable var="rule" value="#{results.rules}">
-                                            <p:column style="padding: 0px">
-                                                <p:commandButton styleClass="ruleselect-button"
-                                                                 style="width: 95%;"
-                                                                 onclick="addHighlightCssSingleRule('#{rule.ruleId}', '#{rule.decisionKey}');"
-                                                                 value="#{rule.tableName.concat(' (').concat(rule.rowNumber).concat(')')}"/>
-                                            </p:column>
-                                        </p:dataTable>
-                                    </h:panelGroup>
-                                </p:column>
-                            </p:dataTable>
-                        </p:rowExpansion>
-                    </p:dataTable>
-                </f:facet>
-            </p:ajaxStatus>
-
-            <!-- Multi Table -->
-            <p:ajaxStatus style="display:block;">
-                <f:facet name="default">
-                </f:facet>
-
-                <f:facet name="start">
-                </f:facet>
-
-                <f:facet name="complete">
-                    <h2>Multi table results</h2>
-                    <p:dataTable var="verifier"
-                                 value="#{tableDataBean.verifierResultListMultiTables}"
-                                 emptyMessage="No records found, check syntax!">
-                        <p:column style="width:16px">
-                            <p:rowToggler/>
-                        </p:column>
-
-                        <p:column styleClass="col-dataType" headerText="Type">
-                            <h:outputText value="#{verifier.verifierType}"/>
-                        </p:column>
-
-                        <p:column styleClass="col-description" headerText="Description">
-                            <h:outputText value="#{verifier.verificationDescription}"/>
-                        </p:column>
-
-                        <p:column styleClass="col-quantity" headerText="Quantity">
-                            <h:outputText value="#{verifier.verificationsCount}"/>
-                        </p:column>
-
-                        <p:rowExpansion>
-                            <p:dataTable var="results" value="#{verifier.verifications}">
-                                <p:column styleClass="subcol-message" headerText="Message">
-                                    <h:outputText value="#{results.message}"/>
-                                </p:column>
-                                <p:column styleClass="subcol-rules" headerText="Rules">
-                                    <h:panelGroup rendered="#{not verifier.multiTable}">
+            <h:panelGroup id="content-buttons" layout="block">
+                <h:form>
+                    <p:commandButton value="Verify"
+                                     id="verify-button"
+                                     styleClass="dmn-button"
+                                     onclick="exportDiagram()"
+                                     action="#{buttonBean.validateDmn}"
+                                     update="content"
+                                     disabled="#{buttonBean.disabled}"/>
+
+                    <!--
+                    <p:selectBooleanCheckbox value="#{buttonBean.calculateMultiTable}"
+                                             disabled="#{buttonBean.disabled}"
+                                             itemLabel="Calculate Multi Table"/>
+                    -->
+                    <p:commandButton value="Empty DMN"
+                                     id="clear-button"
+                                     styleClass="dmn-button"
+                                     action="#{buttonBean.setEmptyDmn}"
+                                     update="content"
+                                     ajax="true"/>
+
+                    <p:commandButton value="Sample DMN"
+                                     id="sample-button"
+                                     styleClass="dmn-button"
+                                     action="#{buttonBean.setSampleDmn}"
+                                     update="content"
+                                     ajax="true"/>
+
+                    <p:commandButton value="Sample Multi"
+                                     id="sample2-button"
+                                     styleClass="dmn-button"
+                                     action="#{buttonBean.setSampleMultiDmn}"
+                                     update="content"
+                                     ajax="true"/>
+
+                    <p:commandButton value="Download"
+                                     id="download-button"
+                                     styleClass="dmn-button"
+                                     onclick="exportDiagram()"
+                                     ajax="false"
+                                     disabled="#{buttonBean.disabled}">
+                        <p:fileDownload value="#{buttonBean.downloadDmn}"/>
+                    </p:commandButton>
+                </h:form>
+            </h:panelGroup>
+            <h:panelGroup id="content-tables" layout="block">
+                <!-- Single Table -->
+                <p:ajaxStatus style="display:block;">
+                    <f:facet name="default">
+                    </f:facet>
+
+                    <f:facet name="start">
+                        <p:graphicImage style="margin-left: 20px;" name="img/Spinner.gif"/>
+                    </f:facet>
+
+                    <f:facet name="complete">
+                        <h2>Single table results</h2>
+                        <p:dataTable var="verifier"
+                                     value="#{tableDataBean.verifierResultListSingleTables}"
+                                     emptyMessage="No records found, check syntax!">
+                            <p:column style="width:16px">
+                                <p:rowToggler/>
+                            </p:column>
+
+                            <p:column styleClass="col-dataType" headerText="Type">
+                                <h:outputText value="#{verifier.verifierType}"/>
+                            </p:column>
+
+                            <p:column styleClass="col-description" headerText="Description">
+                                <h:outputText value="#{verifier.verificationDescription}"/>
+                            </p:column>
+
+                            <p:column styleClass="col-quantity" headerText="Quantity">
+                                <h:outputText value="#{verifier.verificationsCount}"/>
+                            </p:column>
+
+                            <p:rowExpansion>
+                                <p:dataTable var="results" value="#{verifier.verifications}">
+                                    <p:column styleClass="subcol-message" headerText="Message">
+                                        <h:outputText value="#{results.message}"/>
+                                    </p:column>
+                                    <p:column styleClass="subcol-rules" headerText="Rules">
                                         <p:commandButton styleClass="ruleselect-button"
                                                          style="width: 95%;"
                                                          onclick="addHighlightCss(#{results.rulesAsJson});"
                                                          value="Show"/>
-                                    </h:panelGroup>
-                                    <h:panelGroup rendered="#{verifier.multiTable}">
+                                    </p:column>
+                                </p:dataTable>
+                            </p:rowExpansion>
+                        </p:dataTable>
+                    </f:facet>
+                </p:ajaxStatus>
+
+                <!-- Multi Table -->
+                <p:ajaxStatus style="display:block;">
+                    <f:facet name="default">
+                    </f:facet>
+
+                    <f:facet name="start">
+                    </f:facet>
+
+                    <f:facet name="complete">
+                        <h2>Multi table results</h2>
+                        <p:dataTable var="verifier"
+                                     value="#{tableDataBean.verifierResultListMultiTables}"
+                                     emptyMessage="No records found, check syntax!">
+                            <p:column style="width:16px">
+                                <p:rowToggler/>
+                            </p:column>
+
+                            <p:column styleClass="col-dataType" headerText="Type">
+                                <h:outputText value="#{verifier.verifierType}"/>
+                            </p:column>
+
+                            <p:column styleClass="col-description" headerText="Description">
+                                <h:outputText value="#{verifier.verificationDescription}"/>
+                            </p:column>
+
+                            <p:column styleClass="col-quantity" headerText="Quantity">
+                                <h:outputText value="#{verifier.verificationsCount}"/>
+                            </p:column>
+
+                            <p:rowExpansion>
+                                <p:dataTable var="results" value="#{verifier.verifications}">
+                                    <p:column styleClass="subcol-message" headerText="Message">
+                                        <h:outputText value="#{results.message}"/>
+                                    </p:column>
+                                    <p:column styleClass="subcol-rules" headerText="Rules">
                                         <p:dataTable var="rule" value="#{results.rules}">
                                             <p:column style="padding: 0px">
                                                 <p:commandButton styleClass="ruleselect-button"
@@ -191,13 +175,13 @@
                                                                  value="#{rule.tableName.concat(' (').concat(rule.rowNumber).concat(')')}"/>
                                             </p:column>
                                         </p:dataTable>
-                                    </h:panelGroup>
-                                </p:column>
-                            </p:dataTable>
-                        </p:rowExpansion>
-                    </p:dataTable>
-                </f:facet>
-            </p:ajaxStatus>
+                                    </p:column>
+                                </p:dataTable>
+                            </p:rowExpansion>
+                        </p:dataTable>
+                    </f:facet>
+                </p:ajaxStatus>
+            </h:panelGroup>
         </h:panelGroup>
     </ui:define>
 </ui:composition>
diff --git a/dmn-verifier-app/src/main/webapp/resources/css/stylesheet.css b/dmn-verifier-app/src/main/webapp/resources/css/stylesheet.css
index 015738a19da8cb7830b4b19697f909a3007583f2..8759380d43a2226c90111cabab76dd409a0375c7 100644
--- a/dmn-verifier-app/src/main/webapp/resources/css/stylesheet.css
+++ b/dmn-verifier-app/src/main/webapp/resources/css/stylesheet.css
@@ -2,6 +2,7 @@ html, body {
   height: 100%;
   padding: 0;
   margin: 0;
+  font-size: 10pt;
 }
 
 h2 {
@@ -50,6 +51,17 @@ h2 {
 
 #content-dmn {
   margin: 5px;
+  position: relative;
+}
+
+#content-buttons {
+  margin: 5px;
+  position: relative;
+}
+
+#content-tables {
+  margin: 5px;
+  position: relative;
 }
 
 .dmn-js-parent {