Improve settings screen