Token sorting

Added sorting of machine and container tokens in the machine view.
I think this is okay, but you might want to check with @hatched to be sure