Base: Improve layout of options page