Fix startup nav issues