Merge Settings : Squash of new profile UI