Fixed the navigation to take single pages into account too.