Tweaks to winforms