new display logic, one edit element at a time plus tests