Fix date ordering and UI