Fixed up base template