Add some forms and update controllers