restructure of templates, renaming of model fields, general tidying of css