Updated control ids
More changes
Prepairing new style