Cosmetic changes to show page and bug fixes for master