hero edit and form fixed