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 guess you're right, we could listen for the delete event for each token, but will that be a huge performance hit?