Fixed issues with buttons