Fixes for windows 8
Some small changes to improve the wizard control options