More improvement on modal list