New design + todo: select on edit