Fixing multi-level navigation issues