Some redesigns in edit and create user form