Added proper pages for add/edit forms and controllers