Next wave changes

Removed custom control for field templates