Redesigned edit functionality