add styling to show page
resolve merge conflicts