some button improvements