Init of save functionality, and tidy up of templates