Sprint 5 - commit 5

Changes to views and tidy up