Fixed navigator + logout