edit/create views revamped