Added controls to sort the machine and container tokens.