Make all popups consistent #20