Fix multipage navigation (issue #17)