Finished refactoring into viewcontrollers