Improve settings tabs