Fix component add/change and delete dialogs

Ok, Let me see how to clean this up a bit.