Popupa and other issues fixed