Change saml_settings mapping
User profile layout
Added functionality to Profile and other fixes