button click fixes

2.0 n stuff