Token sorting

Added sorting of machine and container tokens in the machine view.