Updated machine and container tokens layouts and added more menu.