Fixed index, added views.