fixed weird internal nav issues
fix merge conflicts