Updated add/edit forms