Schedule modal refactored