Close popups by clicking buttons in modals

[JMatej]

• there are two new modals which we should close:

[mrshu]

@JMatej just one last comment -- please feel free to merge this in :slightly_smiling_face: