Fixed issues with some buttons