added button to show page
pulled from master
made edits to the user show page