Improve templates in preparation for the next phase of the work
We will be adding more pages as we add the regression track work.
There is also a clean up for regtracker in this MR
We will be adding more pages as we add the regression track work.
There is also a clean up for regtracker in this MR