Fixing some navigational issues.