Changes made to try to fix button bug