fixed show page
Merge branch 'master' into authenticate