page count display fix
Merge branch 'master' into presenter-view