Fix some toolbar glitches