Fixed removing of the buttons.