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.
Is this because we re-render the tokens? I'm confused as to when this would apply.