Buttons improved