Improvement on modal list