split _form into new/past and edit, removed divs for edit page, made contents display block on edit