Updated UI and added indexer