Buttons style improved