diff --git a/src/PlumedToHTML/PlumedFormatter.py b/src/PlumedToHTML/PlumedFormatter.py
index 2c2a8f2..7b3508a 100644
--- a/src/PlumedToHTML/PlumedFormatter.py
+++ b/src/PlumedToHTML/PlumedFormatter.py
@@ -32,7 +32,7 @@ def __init__(self, **options) :
 
     def format(self, tokensource, outfile):
         action, label, all_labels, keywords, shortcut_state, shortcut_depth, default_state, notooltips, expansion_label, hidden_state, hidenum, nfiles = "", "", set(), [], 0, 0, 0, False, "", 0, 0, 0
-        outfile.write('<pre style="width=97%;">\n')
+        outfile.write('<pre class="plumedlisting">\n')
         for ttype, value in tokensource :
             # This checks if we are at the start of a new action.  If we are we should be reading a value or an action and the label and action for the previous one should be set
             if len(action)>0 and (ttype==String or ttype==Keyword or ttype==Comment.Preproc) :
diff --git a/src/PlumedToHTML/PlumedToHTML.py b/src/PlumedToHTML/PlumedToHTML.py
index 348e49d..6480bcc 100644
--- a/src/PlumedToHTML/PlumedToHTML.py
+++ b/src/PlumedToHTML/PlumedToHTML.py
@@ -358,21 +358,37 @@ def get_html( inpt, name, outloc, tested, broken, plumedexe, usejson=None, maxch
     plumed_formatter = load_formatter_from_file(formatfile, "PlumedFormatter", keyword_dict=keyword_dict, input_name=name, hasload=found_load, broken=any(broken), auxinputs=inputfiles, auxinputlines=inputfilelines, valuedict=valuedict, actions=actions )
 
     # Now generate html of input
-    html = '<div style="width: 100%; float:left">\n'
-    html += '<div style="width: 90%; float:left" id="value_details_' + name + '"> Click on the labels of the actions for more information on what each action computes </div>\n'
-    html += '<div style="width: 10%; float:left"><table>'
+    html = '<div class="plumedpreheader">\n'
+    html += f'<div class="headerInfo" id="value_details_{name}"> Click on the labels of the actions for more information on what each action computes </div>\n'
+    html += '<div class="containerBadge">\n'
     for i in range(len(tested)) :
+        html +='<div class="headerBadge">'
         btype = 'passing-green.svg'
-        if broken[i] : btype = 'failed-red.svg' 
-        html += '<tr><td style="padding:1px">' 
-        if ghmarkdown : html += '<a href="' + outloc + '.' +  plumedexe[i] + '.stderr">'
-        else : html += '<a href="../' + outloc + '.' +  plumedexe[i] + '.stderr">'
-        html += '<img src=\"https://img.shields.io/badge/' + tested[i] + '-' + btype + '" alt="tested on' + tested[i] + '" /></a></td></tr>'
+        if broken[i] :
+           btype = 'failed-red.svg'
+        #this if can be collapsed in a f'<a href="{"" if ghmarkdown else "../"}{outloc}.{plumedexe[i]}.stderr">'
+        #but like this it might be clearer, what do you think?
+        if ghmarkdown :
+           html += f'<a href="{outloc}.{plumedexe[i]}.stderr">'
+        else :
+           html += f'<a href="../{outloc}.{plumedexe[i]}.stderr">'
+        html += f'<img src="https://img.shields.io/badge/{tested[i]}-{btype}" alt="tested on{tested[i]}" />'
+        html += '</a>'
+        html += '</div>\n'
+
     if found_load :
-       html += '<tr><td style="padding:1px"><img src=\"https://img.shields.io/badge/with-LOAD-yellow.svg" alt="tested on master" /></td></tr>\n'
+       html += '<div class="headerBadge">'
+       html += '<img src="https://img.shields.io/badge/with-LOAD-yellow.svg" alt="tested on master" />'
+       html += '</div>\n'
+
     if len(incomplete)>0 : 
-       html += "<tr><td style=\"padding:0px\"><img class=\"toggler\" src=\"https://img.shields.io/badge/" + tested[-1] + "-incomplete-yellow.svg\" alt=\"tested on " + tested[-1] + "\" onmouseup=\'toggleDisplay(\"" + name + "\")\' onmousedown=\'toggleDisplay(\"" + name + "\")\'/></td></tr>\n" 
-    html += '</table></div></div>\n' 
+       html += '<div class="headerBadge">'
+       html += f'<img class="toggler" src="https://img.shields.io/badge/{tested[-1]}-incomplete-yellow.svg" alt="tested on {tested[-1]}"'
+       html += f" onmouseup='toggleDisplay(\"{name}\")' onmousedown='toggleDisplay(\"{name}\")'/>"
+       html += "</div>\n"
+
+    html += '</div>\n</div>\n' 
+
     if len(incomplete)>0 : 
        # This creates the input with the __FILL__ 
        html += "<div id=\"" + name + "_short\">\n"
@@ -622,7 +638,10 @@ def compare_to_reference( output, reference ) :
        soup_tooltips = soup.find_all(attrs={'class': 'plumedtooltip'})
        print("CHECK TOOLTIP",  soup_tooltips )
        print("TOOLTIP NUMBER CORRECT", len(soup_tooltips), len(reference["tooltips"]))
-       if len(soup_tooltips)!=len(reference["tooltips"]) : return False
+       if len(soup_tooltips)!=len(reference["tooltips"]) :
+         print ("REFERENCE tooltips: ",reference["tooltips"])
+         print ("FOUND tooltips:     ",[x.contents[0] for x in soup_tooltips])
+         return False
        for i in range(len(soup_tooltips)) :
            print("COMPARISON", soup_tooltips[i].contents[0], reference["tooltips"][i] )
            if soup_tooltips[i].contents[0]!=reference["tooltips"][i] : return False
diff --git a/src/PlumedToHTML/assets/header.html b/src/PlumedToHTML/assets/header.html
index ba7a743..bc099b9 100644
--- a/src/PlumedToHTML/assets/header.html
+++ b/src/PlumedToHTML/assets/header.html
@@ -1,4 +1,23 @@
 <style>
+.plumedpreheader{
+    width: 100%;
+    display: grid;
+    grid-template-areas:
+      "info badges";
+    grid-template-columns: 90% 10%;
+}
+.plumedpreheader > div.headerInfo{
+    grid-area: info;
+
+}
+.plumedpreheader > div.containerBadge{
+    grid-area: badges;
+    display: block;
+}
+pre.plumedlisting{
+    width:97%;
+    overflow: visible;
+}
 pre.fragment {
     border: 1px solid #C4CFE5;
     background-color: #FBFCFD;
diff --git a/tdata/cltooltests.json b/tdata/cltooltests.json
index 2bcae43..1b5dcd5 100644
--- a/tdata/cltooltests.json
+++ b/tdata/cltooltests.json
@@ -40,19 +40,19 @@
           "input": "plumed-runtime benchmark --kernel /path/to/lib/libplumedKernel.so",
           "index": 6,
           "output": "<div class=\"highlight\"><pre><span></span><span class=\"s\">plumed-runtime</span> <span class=\"k\">benchmark</span> <span class=\"na\">--kernel</span> /path/to/lib/libplumedKernel.so\n</pre></div>\n",
-          "tooltips": ["benchmark", "--kernel", "benchmark", "--kernel", "--plumed", "--natoms", "--nsteps", "--maxtime", "--sleep", "--atom-distribution"]
+          "tooltips": ["benchmark", "--kernel", "benchmark", "--kernel", "--plumed", "--natoms", "--nsteps", "--maxtime", "--sleep", "--atom-distribution", "--repeatX", "--repeatY", "--repeatZ"]
        },
        {
           "input": "plumed benchmark",
           "index": 7,
           "output": "<div class=\"highlight\"><pre><span></span><span class=\"s\">plumed</span> <span class=\"k\">benchmark</span>\n</pre></div>\n",
-          "tooltips": ["benchmark", "benchmark", "--plumed", "--kernel", "--natoms", "--nsteps", "--maxtime", "--sleep", "--atom-distribution"]
+          "tooltips": ["benchmark", "benchmark", "--plumed", "--kernel", "--natoms", "--nsteps", "--maxtime", "--sleep", "--atom-distribution", "--repeatX", "--repeatY", "--repeatZ"]
        },
        {
           "input": "mpirun -np 4 plumed-runtime benchmark",
           "index": 8,
           "output": "<div class=\"highlight\"><pre><span></span><span class=\"l\">mpirun -np</span> 4 <span class=\"s\">plumed-runtime</span> <span class=\"k\">benchmark</span>\n</pre></div>\n",
-          "tooltips": ["mpirun -np", "benchmark", "mpirun -np", "benchmark", "--plumed", "--kernel", "--natoms", "--nsteps", "--maxtime", "--sleep", "--atom-distribution"]
+          "tooltips": ["mpirun -np", "benchmark", "mpirun -np", "benchmark", "--plumed", "--kernel", "--natoms", "--nsteps", "--maxtime", "--sleep", "--atom-distribution", "--repeatX", "--repeatY", "--repeatZ"]
        },
        {
           "input": "plumed --no-mpi gen_json --actions action_list > syntax.json",
diff --git a/tests/test_clfilelexing.py b/tests/test_clfilelexing.py
deleted file mode 100644
index 2bb5ee2..0000000
--- a/tests/test_clfilelexing.py
+++ /dev/null
@@ -1,32 +0,0 @@
-from unittest import TestCase
-
-import os
-import json
-from io import StringIO
-from PlumedToHTML.PlumedCLFileLexer import PlumedCLFileLexer 
-import PlumedToHTML
-from pygments.formatters import HtmlFormatter
-
-class TestPlumedLexer(TestCase):
-   def testSimple(self) :
-       # Open the json file and read it in
-       f = open("tdata/clfiletests.json")
-       tests = json.load(f)
-       f.close()
-
-       # Setup an HTML formatter
-       f = HtmlFormatter()  
-
-       # Now run over all the inputs in the json
-       for item in tests["regtests"] :
-           with self.subTest(item=item):
-               tokensource = list(PlumedCLFileLexer().get_tokens(item["input"]))
-               output = StringIO()
-               f.format( tokensource, output )
-               data = {}
-               data["out"] = output.getvalue() 
-               print( item["input"] )
-               print( json.dumps( data, indent=3 ) )
-               self.assertTrue( output.getvalue()==item["output"] )
-               out = PlumedToHTML.get_cltoolfile_html( item["input"], "plinp" + str(item["index"]), ("plumed",) )
-               self.assertTrue( PlumedToHTML.compare_to_reference( out, item ) )
diff --git a/tests/test_cllexing.py b/tests/test_cllexing.py
index 66c7918..49bcba0 100644
--- a/tests/test_cllexing.py
+++ b/tests/test_cllexing.py
@@ -3,30 +3,37 @@
 import os
 import json
 from io import StringIO
-from PlumedToHTML.PlumedCLtoolLexer import PlumedCLtoolLexer 
-import PlumedToHTML
 from pygments.formatters import HtmlFormatter
 
+import PlumedToHTML
+
 class TestPlumedLexer(TestCase):
-   def testSimple(self) :
+   def lexerTestTemplate(self,file:str, lexerFunc, htmlFunction) :
        # Open the json file and read it in
-       f = open("tdata/cltooltests.json")
-       tests = json.load(f)
-       f.close()
+      with open(file) as f:
+         tests = json.load(f)
+
+      # Setup an HTML formatter
+      formatter = HtmlFormatter()  
 
-       # Setup an HTML formatter
-       f = HtmlFormatter()  
+      # Now run over all the inputs in the json
+      for item in tests["regtests"] :
+         with self.subTest(item=item,msg=item["input"]):
+            tokensource = list(lexerFunc().get_tokens(item["input"]))
+            output = StringIO()
+            formatter.format( tokensource, output )
+            data = {}
+            data["out"] = output.getvalue() 
+            print( f'**INPUT:"{item["input"]}"' )
+            print( json.dumps( data, indent=3 ) )
+            self.assertEqual( output.getvalue(),item["output"] )
+            out = htmlFunction( item["input"], "plinp" + str(item["index"]), ("plumed",) )
+            self.assertTrue( PlumedToHTML.compare_to_reference( out, item ) )
 
-       # Now run over all the inputs in the json
-       for item in tests["regtests"] :
-           with self.subTest(item=item):
-               tokensource = list(PlumedCLtoolLexer().get_tokens(item["input"]))
-               output = StringIO()
-               f.format( tokensource, output )
-               data = {}
-               data["out"] = output.getvalue() 
-               print( item["input"] )
-               print( json.dumps( data, indent=3 ) )
-               self.assertTrue( output.getvalue()==item["output"] )
-               out = PlumedToHTML.get_cltoolarg_html( item["input"], "plinp" + str(item["index"]), ("plumed",) )
-               self.assertTrue( PlumedToHTML.compare_to_reference( out, item ) )
+   def testCLtoolLexer(self) :
+      from PlumedToHTML.PlumedCLtoolLexer import PlumedCLtoolLexer 
+      self.lexerTestTemplate("tdata/cltooltests.json",PlumedCLtoolLexer, PlumedToHTML.get_cltoolarg_html)
+   
+   def testCLFileLexer(self) :
+      from PlumedToHTML.PlumedCLFileLexer import PlumedCLFileLexer 
+      self.lexerTestTemplate("tdata/clfiletests.json",PlumedCLFileLexer, PlumedToHTML.get_cltoolfile_html)