more custom button improvements