Add new index view and redo some view logic