Thanks.
I attached what I believe to be improved version, while keeping your positioning logic. It fixes compiler warning, loading custom button text from resources, naming issues, and minor formatting inconsistencies.
If you're okay with it, I'll submit under your name, or you can do it yourself.
Nikolay