housekeeping, fixing nav issues