Small changes to the panels and template