[imp] [33385] Move getControlGroups into a JLayout
Fix #3209
Codestyle
Codestyle again