More updates to Date Picker Standalone