Working on show page.
Resolved merge conflict