Tweaks in NavMaker

NavMaker and some header stuff. for v4. release