More work on Show Page
Merge pull request #23 from arvindmehra/am-more-on-show-page

More work on Show Page