add other popups and small fixes