fix some styling with buttons and layouts thank you jillian
merge master
fix back/next button layout