Modified form helpers and added views