Fixed highlighted cell issue, fixed delay from gender to map screens