Resolve duplicate IDs
Improved Control creatiom