Updated machine and container tokens layouts and added more menu

Updated the machine and container layouts to match the new designs. Move the token delete buttons to more menus for both tokens.
Agreed, I guess that should be a `notRootContainer` flag or something.