Little fixing around navigation