Cleaned up result controller and form view