Shared Context Better Fix
Add Datepicker