Add some sorting and date formatting