[CHORE] Sorts out template & style bugs