Re-arranged/refactored to prepare for implementation of dynamic loading of controls (tags and users)