Restructured controller and added form partial