Fixed issue with broken buttons.