Added basic views. Tidy up