Minor & major buy template changes