Connected view controllers and much refactoring