Updated index views and comments