Revert "Override Ezra's changes, List View added"

This reverts commit cebac295c1b329ebb4f23862f05acd1a70057ca3.