Yet another improvement of navbar layout heuristics 

Could you eventually, please, test this with your tablet?
Thanks.