Window UIFactory fixes
Merge branch 'master' of github.com:CaffeinaLab/Trimethyl