cleanup and added pickaday for date selection