Refactor show page, break out accordion