Navigation Fix with custom marker and viewport alignment