Replaced Weblocks navigation with improved navigation version