Buttons improvements