Fix date picker
Fix calendar UI