Update SettingsUI
Cleanup