Fix when hiding start options and little optimization