fixed controller and view to match comments