Controller, models & views refactoring.
Refactoring. Make controller thinner. Add decorators for models and use them in views, so views also look better now.