finishes refactoring tour views