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.
I thought that we were going to have the menu event handling in each token and then have the tokens re-fire when necessary?