fix some button related issues