Tidy up of delete buttons