Improved layout for form-date-find