Settings: Cleanup and update UI