Huge improvements to the layout for the options tab