big changes to bring the buttons in line