diff --git a/docs/custom/DoxygenLayout.xml b/docs/custom/DoxygenLayout.xml
index 2d145ba5a..d8c10604d 100644
--- a/docs/custom/DoxygenLayout.xml
+++ b/docs/custom/DoxygenLayout.xml
@@ -1,68 +1,33 @@
 <doxygenlayout version="1.0">
-  <!-- Generated by doxygen 1.8.14 -->
+  <!-- Generated by doxygen 1.8.15 -->
   <!-- Navigation index tabs for HTML output -->
-  <!-- <navindex> -->
-  <!--   <tab type="mainpage" visible="yes" title=""/> -->
-  <!--   <tab type="pages" visible="yes" title="" intro=""/> -->
-  <!--   <tab type="modules" visible="yes" title="" intro=""/> -->
-  <!--   <tab type="namespaces" visible="yes" title=""> -->
-  <!--     <tab type="namespacelist" visible="yes" title="" intro=""/> -->
-  <!--     <tab type="namespacemembers" visible="yes" title="" intro=""/> -->
-  <!--   </tab> -->
-  <!--   <tab type="classes" visible="yes" title=""> -->
-  <!--     <tab type="classlist" visible="yes" title="" intro=""/> -->
-  <!--     <tab type="classindex" visible="$ALPHABETICAL_INDEX" title=""/>  -->
-  <!--     <tab type="hierarchy" visible="yes" title="" intro=""/> -->
-  <!--     <tab type="classmembers" visible="yes" title="" intro=""/> -->
-  <!--   </tab> -->
-  <!--   <tab type="files" visible="yes" title=""> -->
-  <!--     <tab type="filelist" visible="yes" title="" intro=""/> -->
-  <!--     <tab type="globals" visible="yes" title="" intro=""/> -->
-  <!--   </tab> -->
-  <!--   <tab type="examples" visible="yes" title="" intro=""/>   -->
-  <!-- </navindex> -->
+  <navindex>
+    <tab type="mainpage" visible="yes" title=""/>
+    <tab type="pages" visible="yes" title="" intro=""/>
+    <tab type="modules" visible="yes" title="Sections" intro=""/>
+    <tab type="namespaces" visible="yes" title="Modules">
+      <tab type="namespacelist" visible="yes" title="" intro=""/>
+      <tab type="namespacemembers" visible="yes" title="" intro=""/>
+    </tab>
+    <tab type="classes" visible="yes" title="Predicates and Classes">
+      <tab type="classlist" visible="yes" title="" intro=""/>
+      <tab type="classindex" visible="no" title=""/> 
+      <tab type="hierarchy" visible="no" title="" intro=""/>
+      <tab type="classmembers" visible="yes" title="" intro=""/>
+    </tab>
+    <tab type="files" visible="yes" title="">
+      <tab type="filelist" visible="yes" title="" intro=""/>
+      <tab type="globals" visible="yes" title="" intro=""/>
+    </tab>
+    <tab type="examples" visible="yes" title="" intro=""/>  
+  </navindex>
 
   <!-- Layout definition for a class page -->
   <class>
-    <briefdescription visible="yes"/>
+    <detaileddescription title=""/>
     <includes visible="$SHOW_INCLUDE_FILES"/>
     <inheritancegraph visible="$CLASS_GRAPH"/>
     <collaborationgraph visible="$COLLABORATION_GRAPH"/>
-    <memberdecl>
-      <nestedclasses visible="yes" title=""/>
-      <publictypes title=""/>
-      <services title=""/>
-      <interfaces title=""/>
-      <publicslots title=""/>
-      <signals title=""/>
-      <publicmethods title=""/>
-      <publicstaticmethods title=""/>
-      <publicattributes title=""/>
-      <publicstaticattributes title=""/>
-      <protectedtypes title=""/>
-      <protectedslots title=""/>
-      <protectedmethods title=""/>
-      <protectedstaticmethods title=""/>
-      <protectedattributes title=""/>
-      <protectedstaticattributes title=""/>
-      <packagetypes title=""/>
-      <packagemethods title=""/>
-      <packagestaticmethods title=""/>
-      <packageattributes title=""/>
-      <packagestaticattributes title=""/>
-      <properties title=""/>
-      <events title=""/>
-      <privatetypes title=""/>
-      <privateslots title=""/>
-      <privatemethods title=""/>
-      <privatestaticmethods title=""/>
-      <privateattributes title=""/>
-      <privatestaticattributes title=""/>
-      <friends title=""/>
-      <related title="" subtitle=""/>
-      <membergroups visible="yes"/>
-    </memberdecl>
-    <detaileddescription title=""/>
     <memberdef>
       <inlineclasses title=""/>
       <typedefs title=""/>
@@ -83,17 +48,6 @@
 
   <!-- Layout definition for a namespace page -->
   <namespace>
-    <briefdescription visible="yes"/>
-    <memberdecl>
-      <nestednamespaces visible="yes" title=""/>
-      <constantgroups visible="yes" title=""/>
-      <classes visible="yes" title=""/>
-      <typedefs title=""/>
-      <enums title=""/>
-      <functions title=""/>
-      <variables title=""/>
-      <membergroups visible="yes"/>
-    </memberdecl>
     <detaileddescription title=""/>
     <memberdef>
       <inlineclasses title=""/>
@@ -107,23 +61,11 @@
 
   <!-- Layout definition for a file page -->
   <file>
-    <briefdescription visible="yes"/>
+    <detaileddescription title=""/>
     <includes visible="$SHOW_INCLUDE_FILES"/>
     <includegraph visible="$INCLUDE_GRAPH"/>
     <includedbygraph visible="$INCLUDED_BY_GRAPH"/>
     <sourcelink visible="yes"/>
-    <memberdecl>
-      <classes visible="yes" title=""/>
-      <namespaces visible="yes" title=""/>
-      <constantgroups visible="yes" title=""/>
-      <defines title=""/>
-      <typedefs title=""/>
-      <enums title=""/>
-      <functions title=""/>
-      <variables title=""/>
-      <membergroups visible="yes"/>
-    </memberdecl>
-    <detaileddescription title=""/>
     <memberdef>
       <inlineclasses title=""/>
       <defines title=""/>
@@ -137,30 +79,8 @@
 
   <!-- Layout definition for a group page -->
   <group>
-    <briefdescription visible="yes"/>
-    <groupgraph visible="$GROUP_GRAPHS"/>
-    <memberdecl>
-      <nestedgroups visible="yes" title=""/>
-      <dirs visible="yes" title=""/>
-      <files visible="yes" title=""/>
-      <namespaces visible="yes" title=""/>
-      <classes visible="yes" title=""/>
-      <defines title=""/>
-      <typedefs title=""/>
-      <enums title=""/>
-      <enumvalues title=""/>
-      <functions title=""/>
-      <variables title=""/>
-      <signals title=""/>
-      <publicslots title=""/>
-      <protectedslots title=""/>
-      <privateslots title=""/>
-      <events title=""/>
-      <properties title=""/>
-      <friends title=""/>
-      <membergroups visible="yes"/>
-    </memberdecl>
     <detaileddescription title=""/>
+    <groupgraph visible="$GROUP_GRAPHS"/>
     <memberdef>
       <pagedocs/>
       <inlineclasses title=""/>