Changes to modals for day of, fixes for a couple of bugs
Ready to go on the slides and other
Fixed conflicts