Updated UI and index views