Index view is rendere!
Fixed merge conflicts