Navigation is clunky

Other Cross Logic issues: