More UI work, reorg Windows stuff...