Fix sorting
First take at rearranging the machine list
Drop the cycle length text