Better popup/ Close after add