Edit & Delete, overall polish