Improve settings design