Updated scheduling layout