Fix component add/change and delete dialogs