popups done but with some issues