Code review from Richard and Tom

We saw the project was incomplete, but wanted to try some changes, mainly view controller refactoring.