User Profile Improvements
Model fixes