Some tweaks and new template.