big more testing/refactoring of show pages