Fixed UI glitch: remove button to the right