add else to navPages / navPagesRight
Merge branch 'master' into glyph