Made the show page work
Merging conflicts