refactored the views
refactored views
Merge pull request #2 from djdavies/refactorviews

refactored the views