commented and fixed button bug
Merge remote-tracking branch 'origin/fusion' into fusion
random changes