Button functions redef

fine tuning of button features