more cleanup and reorg of TodoView