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.
Why does the machine token get the menu instantiated in the initializer but the container token does it in render?