Updating UI for settings
Merging