Control for Enumerations complete.
Fixing layout issues.