More option button fixes and adjustments