Buttons are less wonky now.