re-organised templates, minor CSS updates