PIM-971 : Clean index view and add form and handler to controller