Revert "This may fix buttons activty not working"