Fixed the index and views