Fix unsaved notifications #594

* cleanup and unify html form field names