Fixed the button issue