diff --git a/BayesWaveUtils/bayeswave_plot_data/navigate.js b/BayesWaveUtils/bayeswave_plot_data/navigate.js
index a2bfb45ad082421fd1efdbc6edb1ce7a4fe1341d..21b9beb801dd2dd4a61017a637e286cb004f1650 100644
--- a/BayesWaveUtils/bayeswave_plot_data/navigate.js
+++ b/BayesWaveUtils/bayeswave_plot_data/navigate.js
@@ -13,6 +13,11 @@ $(document).ready(function(){
     $("#main").load("./html/glitch.html");
   });
 });
+$(document).ready(function(){
+    $("#full").click(function(){
+    $("#main").load("./html/full.html");
+  });
+});
 $(document).ready(function(){
     $("#signalmoments").click(function(){
     $("#main").load("./html/signalmoments.html");
diff --git a/BayesWaveUtils/scripts/megaplot.py b/BayesWaveUtils/scripts/megaplot.py
index 58b334789d2c630854af89aad27de3d2016c07a1..3ea21b9bef82fb4c7dff4413d26db5b7d5311e77 100755
--- a/BayesWaveUtils/scripts/megaplot.py
+++ b/BayesWaveUtils/scripts/megaplot.py
@@ -1847,6 +1847,8 @@ def make_index(htmlDir, plotsDir, tablesDir, model, gps, ifoList, ifoNames, snrL
         index.write('        <li class="menuitem" id="signal">Signal model\n')
     if not restrictModel == 'signal':
         index.write('        <li class="menuitem" id="glitch">Glitch model\n')
+    if fullOnly_flag == 1:
+        index.write('        <li class="menuitem" id="full">signal+glitch model\n')
     #index.write('        <li class="menuitem" id="snr">SNR\n')
     if not restrictModel == 'glitch':
         index.write('        <li class="menuitem" id="signalmoments">Signal waveform moments\n')
@@ -1922,78 +1924,79 @@ def make_model_page(htmlDir, plotsDir, model, ifoList, ifoNames):
     subpage.write('  <hr>\n')
 
 
-
-    ######### Frequency domain waveform #######
-    subpage.write('         <center><h3>Power Spectra</h3></center>\n')
-    for ifo in ifoList:
-        plotsrc = './{plotsDir}{model}_frequence_domain_{ifo}.png'.format(model=model,plotsDir=plotsDir,ifo=ifoNames[int(ifo)])
-        subpage.write('    <a href="'+plotsrc+'"><img src="'+plotsrc+'" alt="'+plotsrc+'" width=500></a>\n')
-    subpage.write('  <br/>\n')
-    subpage.write('  <hr>\n')
-
-
-    ######### f(t) tracks #######
-    subpage.write('         <center><h3>Frequency vs. Time</h3></center>\n')
-    for ifo in ifoList:
-        plotsrc = './{plotsDir}{model}_tf_{ifo}.png'.format(model=model,plotsDir=plotsDir,ifo=ifoNames[int(ifo)])
-        subpage.write('    <a href="'+plotsrc+'"><img src="'+plotsrc+'" alt="'+plotsrc+'" width=500></a>\n')
-    subpage.write('  <br/>\n')
-    subpage.write('  <hr>\n')
-
-    ######### Spectrogram #######
-    subpage.write('         <center><h3>Spectrogram of median waveform</h3></center>\n')
-    for ifo in ifoList:
-        plotsrc = './'+plotsDir+'{0}_spectrogram_Q8_{1}.png'.format(model,ifoNames[int(ifo)])
-        subpage.write('    <a href="'+plotsrc+'"><img src="'+plotsrc+'" alt="'+plotsrc+'" width=500></a>\n')
-    # -- Toggle for full plots
-    subpage.write('<br/>Other Q resolutions: <a id="displayFull'+model+'spect\'" href="javascript:toggle(\'divFull'+model+'spect\',\'displayFull'+model+'spect\');">show</a>\n')
-    subpage.write('  <div id="divFull'+model+'spect'+'" style="display: none">\n')
-    for ifo in ifoList:
-        plotsrc = './'+plotsDir+'{0}_spectrogram_Q4_{1}.png'.format(mod,ifoNames[int(ifo)])
-        subpage.write('    <a href="'+plotsrc+'"><img src="'+plotsrc+'" alt="'+plotsrc+'" width=500></a>\n')
-    for ifo in ifoList:
-        plotsrc = './'+plotsDir+'{0}_spectrogram_Q16_{1}.png'.format(mod,ifoNames[int(ifo)])
-        subpage.write('    <a href="'+plotsrc+'"><img src="'+plotsrc+'" alt="'+plotsrc+'" width=500></a>\n')
-    subpage.write("</div>\n")
-    subpage.write('  <br/>\n')
-    subpage.write('  <hr>\n')
-
-    ######### Data #######
-    subpage.write('         <center><h3>Spectrogram of Data</h3></center>\n')
-    for ifo in ifoList:
-        plotsrc = './'+plotsDir+'data_spectrogram_Q8_{0}.png'.format(ifoNames[int(ifo)])
-        subpage.write('    <a href="'+plotsrc+'"><img src="'+plotsrc+'" alt="'+plotsrc+'" width=500></a>\n')
-    # -- Toggle for full plots
-    subpage.write('<br/>Other Q resolutions: <a id="displayFull'+model+'data\'" href="javascript:toggle(\'divFull'+model+'data\',\'displayFull'+model+'data\');">show</a>\n')
-    subpage.write('  <div id="divFull'+model+'data'+'" style="display: none">\n')
-    for ifo in ifoList:
-        plotsrc = './'+plotsDir+'data_spectrogram_Q4_{0}.png'.format(ifoNames[int(ifo)])
-        subpage.write('    <a href="'+plotsrc+'"><img src="'+plotsrc+'" alt="'+plotsrc+'" width=500></a>\n')
-    for ifo in ifoList:
-        plotsrc = './'+plotsDir+'data_spectrogram_Q16_{0}.png'.format(ifoNames[int(ifo)])
-        subpage.write('    <a href="'+plotsrc+'"><img src="'+plotsrc+'" alt="'+plotsrc+'" width=500></a>\n')
-    subpage.write("</div>\n")
-    subpage.write('  <br/>\n')
-    subpage.write('  <hr>\n')
-
-
-    ######### Residuals #######
-    subpage.write('         <center><h3>Spectrogram of Residuals</h3></center>\n')
-    for ifo in ifoList:
-        plotsrc = './'+plotsDir+'{0}_residual_spectrogram_Q8_{1}.png'.format(model,ifoNames[int(ifo)])
-        subpage.write('    <a href="'+plotsrc+'"><img src="'+plotsrc+'" alt="'+plotsrc+'" width=500></a>\n')
-    # -- Toggle for full plots
-    subpage.write('<br/>Other Q resolutions: <a id="displayFull'+model+'res\'" href="javascript:toggle(\'divFull'+model+'res\',\'displayFull'+model+'res\');">show</a>\n')
-    subpage.write('  <div id="divFull'+model+'res'+'" style="display: none">\n')
-    for ifo in ifoList:
-        plotsrc = './'+plotsDir+'{0}_residual_spectrogram_Q4_{1}.png'.format(mod,ifoNames[int(ifo)])
-        subpage.write('    <a href="'+plotsrc+'"><img src="'+plotsrc+'" alt="'+plotsrc+'" width=500></a>\n')
-    for ifo in ifoList:
-        plotsrc = './'+plotsDir+'{0}_residual_spectrogram_Q16_{1}.png'.format(mod,ifoNames[int(ifo)])
-        subpage.write('    <a href="'+plotsrc+'"><img src="'+plotsrc+'" alt="'+plotsrc+'" width=500></a>\n')
-    subpage.write("</div>\n")
-    subpage.write('  <br/>\n')
-    subpage.write('  <hr>\n')
+    if not model=='full':
+
+      ######### Frequency domain waveform #######
+      subpage.write('         <center><h3>Power Spectra</h3></center>\n')
+      for ifo in ifoList:
+          plotsrc = './{plotsDir}{model}_frequence_domain_{ifo}.png'.format(model=model,plotsDir=plotsDir,ifo=ifoNames[int(ifo)])
+          subpage.write('    <a href="'+plotsrc+'"><img src="'+plotsrc+'" alt="'+plotsrc+'" width=500></a>\n')
+      subpage.write('  <br/>\n')
+      subpage.write('  <hr>\n')
+
+
+      ######### f(t) tracks #######
+      subpage.write('         <center><h3>Frequency vs. Time</h3></center>\n')
+      for ifo in ifoList:
+          plotsrc = './{plotsDir}{model}_tf_{ifo}.png'.format(model=model,plotsDir=plotsDir,ifo=ifoNames[int(ifo)])
+          subpage.write('    <a href="'+plotsrc+'"><img src="'+plotsrc+'" alt="'+plotsrc+'" width=500></a>\n')
+      subpage.write('  <br/>\n')
+      subpage.write('  <hr>\n')
+
+      ######### Spectrogram #######
+      subpage.write('         <center><h3>Spectrogram of median waveform</h3></center>\n')
+      for ifo in ifoList:
+          plotsrc = './'+plotsDir+'{0}_spectrogram_Q8_{1}.png'.format(model,ifoNames[int(ifo)])
+          subpage.write('    <a href="'+plotsrc+'"><img src="'+plotsrc+'" alt="'+plotsrc+'" width=500></a>\n')
+      # -- Toggle for full plots
+      subpage.write('<br/>Other Q resolutions: <a id="displayFull'+model+'spect\'" href="javascript:toggle(\'divFull'+model+'spect\',\'displayFull'+model+'spect\');">show</a>\n')
+      subpage.write('  <div id="divFull'+model+'spect'+'" style="display: none">\n')
+      for ifo in ifoList:
+          plotsrc = './'+plotsDir+'{0}_spectrogram_Q4_{1}.png'.format(mod,ifoNames[int(ifo)])
+          subpage.write('    <a href="'+plotsrc+'"><img src="'+plotsrc+'" alt="'+plotsrc+'" width=500></a>\n')
+      for ifo in ifoList:
+          plotsrc = './'+plotsDir+'{0}_spectrogram_Q16_{1}.png'.format(mod,ifoNames[int(ifo)])
+          subpage.write('    <a href="'+plotsrc+'"><img src="'+plotsrc+'" alt="'+plotsrc+'" width=500></a>\n')
+      subpage.write("</div>\n")
+      subpage.write('  <br/>\n')
+      subpage.write('  <hr>\n')
+
+      ######### Data #######
+      subpage.write('         <center><h3>Spectrogram of Data</h3></center>\n')
+      for ifo in ifoList:
+          plotsrc = './'+plotsDir+'data_spectrogram_Q8_{0}.png'.format(ifoNames[int(ifo)])
+          subpage.write('    <a href="'+plotsrc+'"><img src="'+plotsrc+'" alt="'+plotsrc+'" width=500></a>\n')
+      # -- Toggle for full plots
+      subpage.write('<br/>Other Q resolutions: <a id="displayFull'+model+'data\'" href="javascript:toggle(\'divFull'+model+'data\',\'displayFull'+model+'data\');">show</a>\n')
+      subpage.write('  <div id="divFull'+model+'data'+'" style="display: none">\n')
+      for ifo in ifoList:
+          plotsrc = './'+plotsDir+'data_spectrogram_Q4_{0}.png'.format(ifoNames[int(ifo)])
+          subpage.write('    <a href="'+plotsrc+'"><img src="'+plotsrc+'" alt="'+plotsrc+'" width=500></a>\n')
+      for ifo in ifoList:
+          plotsrc = './'+plotsDir+'data_spectrogram_Q16_{0}.png'.format(ifoNames[int(ifo)])
+          subpage.write('    <a href="'+plotsrc+'"><img src="'+plotsrc+'" alt="'+plotsrc+'" width=500></a>\n')
+      subpage.write("</div>\n")
+      subpage.write('  <br/>\n')
+      subpage.write('  <hr>\n')
+
+
+      ######### Residuals #######
+      subpage.write('         <center><h3>Spectrogram of Residuals</h3></center>\n')
+      for ifo in ifoList:
+          plotsrc = './'+plotsDir+'{0}_residual_spectrogram_Q8_{1}.png'.format(model,ifoNames[int(ifo)])
+          subpage.write('    <a href="'+plotsrc+'"><img src="'+plotsrc+'" alt="'+plotsrc+'" width=500></a>\n')
+      # -- Toggle for full plots
+      subpage.write('<br/>Other Q resolutions: <a id="displayFull'+model+'res\'" href="javascript:toggle(\'divFull'+model+'res\',\'displayFull'+model+'res\');">show</a>\n')
+      subpage.write('  <div id="divFull'+model+'res'+'" style="display: none">\n')
+      for ifo in ifoList:
+          plotsrc = './'+plotsDir+'{0}_residual_spectrogram_Q4_{1}.png'.format(mod,ifoNames[int(ifo)])
+          subpage.write('    <a href="'+plotsrc+'"><img src="'+plotsrc+'" alt="'+plotsrc+'" width=500></a>\n')
+      for ifo in ifoList:
+          plotsrc = './'+plotsDir+'{0}_residual_spectrogram_Q16_{1}.png'.format(mod,ifoNames[int(ifo)])
+          subpage.write('    <a href="'+plotsrc+'"><img src="'+plotsrc+'" alt="'+plotsrc+'" width=500></a>\n')
+      subpage.write("</div>\n")
+      subpage.write('  <br/>\n')
+      subpage.write('  <hr>\n')
     subpage.write('</body>\n')
     subpage.write('</html>\n')
     subpage.close()
@@ -2108,25 +2111,11 @@ def make_webpage(htmlDir, model, mdc, gps, ifoList, ifoNames, modelList, snrList
     for mod in modelList:
         make_model_page(htmlDir, plotsDir, mod, ifoList, ifoNames)
         make_moments_page(htmlDir, plotsDir, mod, ifoList, ifoNames)
+    if fullOnly_flag == 1:
+        make_model_page(htmlDir, plotsDir, 'full', ifoList, ifoNames)
     make_diagnostics_page(htmlDir, plotsDir, model, ifoList, ifoNames,modelList)
     if mdc:
         make_overlap_page(htmlDir, plotsDir, modelList, ifoList, ifoNames)
-    # -- Write all subpages
-#    make_subpage(htmlDir, plotsDir, 'dur_rec', model, modelList, ifoList, ifoNames, momentsPlus, momentsCross,restrictModel)
-#    make_subpage(htmlDir, plotsDir, 't_energy_rec', model, modelList, ifoList, ifoNames, momentsPlus, momentsCross,restrictModel)
-#    make_subpage(htmlDir, plotsDir, 'f0_rec', model, modelList, ifoList, ifoNames, momentsPlus, momentsCross,restrictModel)
-#    make_subpage(htmlDir, plotsDir, 'band_rec', model, modelList, ifoList, ifoNames, momentsPlus, momentsCross,restrictModel)
-#    make_subpage(htmlDir, plotsDir, 't0_rec', model, modelList, ifoList, ifoNames, momentsPlus, momentsCross,restrictModel)
-#    make_subpage(htmlDir, plotsDir, 'h_max', model, modelList, ifoList, ifoNames, momentsPlus, momentsCross,restrictModel)
-#    make_subpage(htmlDir, plotsDir, 't_at_h_max', model, modelList, ifoList, ifoNames, momentsPlus, momentsCross,restrictModel)
-##make_subpage(htmlDir, plotsDir, 'waveform', model, modelList, ifoList, ifoNames, momentsPlus, momentsCross)
-#    make_subpage(htmlDir, plotsDir, 'time_domain', model, modelList, ifoList, ifoNames, momentsPlus, momentsCross,restrictModel)
-#    make_subpage(htmlDir, plotsDir, 'frequency_domain', model, modelList, ifoList, ifoNames, momentsPlus, momentsCross,restrictModel)
-#    make_subpage(htmlDir, plotsDir, 'time_frequency', model, modelList, ifoList, ifoNames, momentsPlus, momentsCross,restrictModel)
-#    make_subpage(htmlDir, plotsDir, 'bayesogram', model, modelList, ifoList, ifoNames, momentsPlus, momentsCross,restrictModel)
-#    make_subpage(htmlDir, plotsDir, 'spec', model, modelList, ifoList, ifoNames, momentsPlus, momentsCross,restrictModel)
-#    make_subpage(htmlDir, plotsDir, 'diagnostics', model, modelList, ifoList, ifoNames, momentsPlus, momentsCross,restrictModel)
-#    make_subpage(htmlDir, plotsDir, 'snr', model, modelList, ifoList, ifoNames, momentsPlus, momentsCross,restrictModel)
     make_subpage(htmlDir, plotsDir, 'skymap', model, modelList, ifoList, ifoNames, momentsPlus, momentsCross,restrictModel)
         #if mdc:
 #make_subpage(htmlDir, plotsDir, 'overlap', model, modelList, ifoList, ifoNames, momentsPlus, momentsCross,restrictModel)