tweak video show and post show pages
Merge remote-tracking branch 'upstream/master'