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.
The machine tokens don't get re-rendered, unlike the container tokens, so we don't have to worry about trying to create the widget at render time.