Added logo on show page
Merge conflict