Cleaned up holiday calculations
Restored and restricted date pickers