Start rework of button styling