Edit labels improved