Change to main index view
Fixed merge conflict in main index view--just took Thu's changes and deleted mine