Improve live view and schedule view