datepicker && refactor && ui improovement