Update conditional implementation approach
Fix ML control styling
Add changes for latest build