Fixed the DISABLED buttons