added stuff to show page
Merge branch 'add-stuff-to-display'