Support for empty schedules
Layout tweaks