editing conditions inline
continued UI changes to support in-marquee editing; flattened primary list