Fixed services controller and views