Fixed issue with buttons