More fixes and re-factoring

- moved news items into separate html file
- general re-factoring and tidying