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.
So originally I had planned that we would only have the listeners in the machine view and then the machine view would call the appropriate methods to reduce on listeners. Then there was that discussion about having the events caught in the token and re-fired. I prefer this approach I was just confused by how many times we went back and forth on this :)