working on show page
Merge pull request #22 from crotten/master

working on show page