Merge Wizard Mac Tweaks

.. a few tidy ups to make it look right
   when running on Mac OSX