In-popup editing