Merged the State / Action container control with the main user control.