Styles stripped back to latest version of barebones, template tweeks, typos