Base: Fix navigation issues