Finishing draft of new navigation. Ready for pitch and finalized design