Changed template locator behavior - now accepts string for controls.
Refactoring controls.