fixed some control IDs