popup close error fixed & some polish of gesture