formatting on show page
resolved merge conflicts