added all popups, need to fix positioning