Fix error in user form on add/edit which blocked saving
Redesigned settings view