Added delete support, factored out the adding controls