Improve the user form and edit view.