Visual Studio build fix

Also fixes button clipping on the apply changes dialog