buttons improvement