diff --git a/dmn-verifier-app/src/main/webapp/index.xhtml b/dmn-verifier-app/src/main/webapp/index.xhtml
index 9a9a8d074ae8c3e04718a27b7f8427ecbbc61912..bef17f9d0fb7027410f75453f2e9318aea25d185 100644
--- a/dmn-verifier-app/src/main/webapp/index.xhtml
+++ b/dmn-verifier-app/src/main/webapp/index.xhtml
@@ -95,90 +95,87 @@
                     </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:tabView>
+                            <p:tab title="Single table results">
+                                <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="subcol-rules" headerText="Rules">
-                                        <p:commandButton styleClass="ruleselect-button"
-                                                         style="width: 95%;"
-                                                         onclick="addHighlightCss(#{results.rulesAsJson});"
-                                                         value="Show"/>
-                                    </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>
+                                    <p:column styleClass="col-dataType" headerText="Type">
+                                        <h:outputText value="#{verifier.verifierType}"/>
+                                    </p:column>
 
-                    <f:facet name="start">
-                    </f:facet>
+                                    <p:column styleClass="col-description" headerText="Description">
+                                        <h:outputText value="#{verifier.verificationDescription}"/>
+                                    </p:column>
 
-                    <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 styleClass="col-quantity" headerText="Quantity">
+                                        <h:outputText value="#{verifier.verificationsCount}"/>
                                     </p:column>
-                                    <p:column styleClass="subcol-rules" headerText="Rules">
-                                        <p:dataTable var="rule" value="#{results.rules}">
-                                            <p:column style="padding: 0px">
+
+                                    <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="addHighlightCssSingleRule('#{rule.ruleId}', '#{rule.decisionKey}');"
-                                                                 value="#{rule.tableName.concat(' (').concat(rule.rowNumber).concat(')')}"/>
+                                                                 onclick="addHighlightCss(#{results.rulesAsJson});"
+                                                                 value="Show"/>
                                             </p:column>
                                         </p:dataTable>
+                                    </p:rowExpansion>
+                                </p:dataTable>
+                            </p:tab>
+                            <p:tab title="Multi Table results">
+                                <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"
+                                                                style="width: 95%;"
+                                                                onclick="addHighlightCssSingleRule('#{rule.ruleId}', '#{rule.decisionKey}');"
+                                                                value="#{rule.tableName.concat(' (').concat(rule.rowNumber).concat(')')}"/>
+                                                    </p:column>
+                                                </p:dataTable>
+                                            </p:column>
+                                        </p:dataTable>
+                                    </p:rowExpansion>
                                 </p:dataTable>
-                            </p:rowExpansion>
-                        </p:dataTable>
+                            </p:tab>
+                        </p:tabView>
                     </f:facet>
                 </p:ajaxStatus>
             </h:panelGroup>
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 8759380d43a2226c90111cabab76dd409a0375c7..70ec5e35b99d10a81d85891acbe8d46df8b61391 100644
--- a/dmn-verifier-app/src/main/webapp/resources/css/stylesheet.css
+++ b/dmn-verifier-app/src/main/webapp/resources/css/stylesheet.css
@@ -9,6 +9,18 @@ h2 {
   margin: 10px;
 }
 
+.ui-tabs .ui-tabs-panel {
+  padding: 0 !important; /* overwrite primefaces css */
+}
+
+.ui-tabs.ui-tabs-top>.ui-tabs-nav {
+  background: transparent !important; /* overwrite primefaces css */
+}
+
+.ui-state-active {
+  font-weight: bold !important; /* overwrite primefaces css */
+}
+
 .col-type {
   width: 25%;
   word-wrap: break-word;