Streamline how attributes render control ui
Merge branch 'origin/develop'