tons of changes to make the buttons flexible and the show page look different
merging conflicts