Initial user handling code & UnitEditView Improvments