Improve settings windows