Add fields to indicator and improve list view