Improve settings UI