Overhaul forgotten control-group to form-group in comments and clean up some other areas that referenced control-group
Merge branch 'issue-3480' of https://github.com/bp323/3akai-ux into issue-3480
Moved placeholder to end