Removed navigation hypercombo mixin and replaced with mixin references.
All notes moved to the top of the document.