popup zone and few more improvements