Added fixes to the navigation (prev/next)