fix(client): resolve some nav issues