Fix up date parsing logic and display
Clean up the interface