Merge "Changes on Settings UI for a better user experience"