added spacers and updated template