Refactor EditableTransferHandler
Fix toc