button improvements