This has not been tested on macOS, and running an osx skin in xp doesn't reflect the width changes properly, so if the layout is still skewed please let me know/post a screenshot so I can adjust the layout.

For the record this is probably not the best way to go regarding the button fix, I would probably recommend looking at the DemoPalette.jsx that is included with 6.5 and study the automagic layout.