Refactoring into multiple controllers and views.