Did a little more merge fixing. Availability buttons on the schedule grid are now working.