Various fixes for adding and deleting, along with style changes