Improve schedule UI