fixed layout and control panel
Merge remote-tracking branch 'origin/master'