Fix sorting, minor display fixes