Enhance Date field, Add Page builder compatibility