fixed Navigation.
meh, let's try something else.
Navigation Part #3 only in prod. Mode testable...
Fix for Navi && In-Place Marker