More work on schedule tab