Code clean-up, add resources for drawingmanager field names