Fix control box
Merge branch 'controlbox'