Model refractoring
Merge add user with profile view control
Model refractor missing file