Tidy up options page layout and behaviour