Buttons improvements everywhere