fix #730 and fix #724 by bringing in @usetheimpe's changes

This brings in code map navigation and hide/show the code map from menu.