Correctly refresh layout when reloading custom buttons (#431)
Cleanup custom button handling
Expand custom buttons
Better fix for #431
Switch to WrapSizer for custom buttons if possible
Merge branch 'cbuttonwinfix'