More fixes to option UI elements