Make the templates consistent and correct