Changed order of sorting
Fixed date labels, close #143