Fixed more formatting issues with control.