Yet another improvement of navbar layout heuristics