Minor refactor value map construction
Work in progress on list view; added group repeat form logic, display needs fixing