Schedule Tab fix