Fix controls in main DoM some more.