Imporve modal