made some edits on views and index