Fix some reverting bugs
Revert some dependencies
[feat] redo preview pane to save a round-trip