minor fixes
design working with big list and element name