Mostly fixed alignment in the templates