diff --git a/src/sunstone/public/js/sunstone.js b/src/sunstone/public/js/sunstone.js
index e8d47ed2f0..b6b12b3e07 100644
--- a/src/sunstone/public/js/sunstone.js
+++ b/src/sunstone/public/js/sunstone.js
@@ -5173,39 +5173,44 @@ function accountingGraphs(div, opt){
           </div>\
         </div>\
       </div>\
-      <div class="row acct_table">\
-        <div class="large-12 columns graph_legend">\
-          <h3 class="subheader"><small>'+tr("CPU hours")+'</small></h3>\
-        </div>\
-        <div class="large-12 columns" style="overflow:auto">\
-          <table id="acct_cpu_datatable" class="datatable twelve">\
-            <thead>\
-              <tr>\
-                <th>'+tr("Date")+'</th>\
-              </tr>\
-            </thead>\
-            <tbody id="tbody_acct_cpu_datatable">\
-            </tbody>\
-          </table>\
-        </div>\
-      </div>\
-      <div class="row acct_table">\
-        <div class="large-12 columns graph_legend">\
-          <h3 class="subheader"><small>'+tr("Memory GB hours")+'</small></h3>\
-        </div>\
-        <div class="large-12 columns" style="overflow:auto">\
-          <table id="acct_mem_datatable" class="datatable twelve">\
-            <thead>\
-              <tr>\
-                <th>'+tr("Date")+'</th>\
-              </tr>\
-            </thead>\
-            <tbody id="tbody_acct_mem_datatable">\
-            </tbody>\
-          </table>\
-        </div>\
-      </div>\
-    </div>');
+      <br>' +
+        generateAdvancedSection({
+            title: tr("Accounting Tables"),
+            html_id: "advanced_accounting_tables",
+            content: '<div class="row acct_table">\
+                <div class="large-12 columns graph_legend">\
+                  <h3 class="subheader"><small>'+tr("CPU hours")+'</small></h3>\
+                </div>\
+                <div class="large-12 columns" style="overflow:auto">\
+                  <table id="acct_cpu_datatable" class="datatable twelve">\
+                    <thead>\
+                      <tr>\
+                        <th>'+tr("Date")+'</th>\
+                      </tr>\
+                    </thead>\
+                    <tbody id="tbody_acct_cpu_datatable">\
+                    </tbody>\
+                  </table>\
+                </div>\
+              </div>\
+              <div class="row acct_table">\
+                <div class="large-12 columns graph_legend">\
+                  <h3 class="subheader"><small>'+tr("Memory GB hours")+'</small></h3>\
+                </div>\
+                <div class="large-12 columns" style="overflow:auto">\
+                  <table id="acct_mem_datatable" class="datatable twelve">\
+                    <thead>\
+                      <tr>\
+                        <th>'+tr("Date")+'</th>\
+                      </tr>\
+                    </thead>\
+                    <tbody id="tbody_acct_mem_datatable">\
+                    </tbody>\
+                  </table>\
+                </div>\
+              </div>'
+        }) +
+    '</div>');
 
     if (opt == undefined){
         opt = {};