Some more changes for the new template