Merge "Layout changes in Settings"