Fixed more state and button issues
Fixed more state and button issues

klassenjs/geomoose-js,geomoose/geomoose-js,klassenjs/geomoose-js,elil/geomoose-js,geomoose/geomoose-js,klassenjs/geomoose-js,elil/geomoose-js,elil/geomoose-js,elil/geomoose-js,klassenjs/geomoose-js,geomoose/geomoose-js,geomoose/geomoose-js