Navigation overlap fix