Fix startup navigation