Converted service screens to use service types. Still converting adding and updating service types.