Cleaning up templates to look good