Fixes for WinSetup

Also added "keep aspect ratio" checkbox