fixes to buttons and formatting