Improve settings layout