Fix component add/change and delete dialogs

Can't think of a better way without changing the actual implementation. Do you have any suggestions?