Re-organized the layout of the options panel