Update templates to make the mockups more readable