Added empty validation controls
Added populated chart controls (smoke-check)