Improve schedule grid