refactored enums in UIDefines