Fix several issues with the options UI.