merged navigation fixes