Revert removal of components essential to tview