Fixed ButtonPanel
Merge origin/master