Settings UI cleanup