Fix component add/change and delete dialogs

I see. That doesn't seem to be a change related to this PR, would prefer us to change that in a separate PR if we can. Or am I missing some relation between the button presses and this PR?