Modified edit and new form pages