Broke out date/time widgets, cleaned up dialog, getting close