diff --git a/examples/widgets/Part 1 - Basics.ipynb b/examples/widgets/Part 1 - Basics.ipynb
index 4ceea7029..2fcf1e64a 100644
--- a/examples/widgets/Part 1 - Basics.ipynb	
+++ b/examples/widgets/Part 1 - Basics.ipynb	
@@ -81,12 +81,13 @@
         "['BoolWidget',\n",
         " 'ButtonWidget',\n",
         " 'ContainerWidget',\n",
+        " 'DOMWidget',\n",
         " 'FloatRangeWidget',\n",
         " 'FloatWidget',\n",
         " 'ImageWidget',\n",
         " 'IntRangeWidget',\n",
         " 'IntWidget',\n",
-        " 'MulticontainerWidget',\n",
+        " 'SelectionContainerWidget',\n",
         " 'SelectionWidget',\n",
         " 'StringWidget',\n",
         " 'Widget']"
@@ -143,13 +144,13 @@
       {
        "metadata": {},
        "output_type": "pyout",
-       "prompt_number": 13,
+       "prompt_number": 10,
        "text": [
-        "42.7"
+        "50.6"
        ]
       }
      ],
-     "prompt_number": 13
+     "prompt_number": 10
     },
     {
      "cell_type": "markdown",
@@ -172,22 +173,22 @@
       {
        "metadata": {},
        "output_type": "pyout",
-       "prompt_number": 14,
+       "prompt_number": 11,
        "text": [
-        "['visible',\n",
-        " '_css',\n",
-        " 'default_view_name',\n",
-        " 'value',\n",
+        "['value',\n",
         " 'step',\n",
         " 'max',\n",
         " 'min',\n",
         " 'disabled',\n",
         " 'orientation',\n",
-        " 'description']"
+        " 'description',\n",
+        " 'visible',\n",
+        " '_css',\n",
+        " 'view_name']"
        ]
       }
      ],
-     "prompt_number": 14
+     "prompt_number": 11
     },
     {
      "cell_type": "markdown",
@@ -205,7 +206,7 @@
      "language": "python",
      "metadata": {},
      "outputs": [],
-     "prompt_number": 15
+     "prompt_number": 12
     },
     {
      "cell_type": "markdown",
@@ -226,13 +227,13 @@
       {
        "metadata": {},
        "output_type": "pyout",
-       "prompt_number": 16,
+       "prompt_number": 13,
        "text": [
         "25.0"
        ]
       }
      ],
-     "prompt_number": 16
+     "prompt_number": 13
     },
     {
      "cell_type": "markdown",
@@ -251,7 +252,7 @@
      "language": "python",
      "metadata": {},
      "outputs": [],
-     "prompt_number": 17
+     "prompt_number": 14
     },
     {
      "cell_type": "code",
@@ -265,13 +266,13 @@
       {
        "metadata": {},
        "output_type": "pyout",
-       "prompt_number": 18,
+       "prompt_number": 15,
        "text": [
-        "u'Nothing Selected'"
+        "u'Item B'"
        ]
       }
      ],
-     "prompt_number": 18
+     "prompt_number": 15
     },
     {
      "cell_type": "heading",
diff --git a/examples/widgets/Part 2 - Events.ipynb b/examples/widgets/Part 2 - Events.ipynb
index 435eb9fe2..83aa30cd2 100644
--- a/examples/widgets/Part 2 - Events.ipynb	
+++ b/examples/widgets/Part 2 - Events.ipynb	
@@ -25,7 +25,7 @@
      "language": "python",
      "metadata": {},
      "outputs": [],
-     "prompt_number": 2
+     "prompt_number": 1
     },
     {
      "cell_type": "heading",
@@ -82,7 +82,7 @@
        ]
       }
      ],
-     "prompt_number": 3
+     "prompt_number": 2
     },
     {
      "cell_type": "markdown",
@@ -113,13 +113,6 @@
      "language": "python",
      "metadata": {},
      "outputs": [
-      {
-       "output_type": "stream",
-       "stream": "stdout",
-       "text": [
-        "1\n"
-       ]
-      },
       {
        "output_type": "stream",
        "stream": "stdout",
@@ -127,20 +120,6 @@
         "2\n"
        ]
       },
-      {
-       "output_type": "stream",
-       "stream": "stdout",
-       "text": [
-        "3\n"
-       ]
-      },
-      {
-       "output_type": "stream",
-       "stream": "stdout",
-       "text": [
-        "4\n"
-       ]
-      },
       {
        "output_type": "stream",
        "stream": "stdout",
@@ -148,34 +127,6 @@
         "5\n"
        ]
       },
-      {
-       "output_type": "stream",
-       "stream": "stdout",
-       "text": [
-        "6\n"
-       ]
-      },
-      {
-       "output_type": "stream",
-       "stream": "stdout",
-       "text": [
-        "7\n"
-       ]
-      },
-      {
-       "output_type": "stream",
-       "stream": "stdout",
-       "text": [
-        "8\n"
-       ]
-      },
-      {
-       "output_type": "stream",
-       "stream": "stdout",
-       "text": [
-        "9\n"
-       ]
-      },
       {
        "output_type": "stream",
        "stream": "stdout",
@@ -190,13 +141,6 @@
         "11\n"
        ]
       },
-      {
-       "output_type": "stream",
-       "stream": "stdout",
-       "text": [
-        "12\n"
-       ]
-      },
       {
        "output_type": "stream",
        "stream": "stdout",
@@ -211,13 +155,6 @@
         "14\n"
        ]
       },
-      {
-       "output_type": "stream",
-       "stream": "stdout",
-       "text": [
-        "15\n"
-       ]
-      },
       {
        "output_type": "stream",
        "stream": "stdout",
@@ -225,13 +162,6 @@
         "16\n"
        ]
       },
-      {
-       "output_type": "stream",
-       "stream": "stdout",
-       "text": [
-        "17\n"
-       ]
-      },
       {
        "output_type": "stream",
        "stream": "stdout",
@@ -250,165 +180,200 @@
        "output_type": "stream",
        "stream": "stdout",
        "text": [
-        "19\n"
+        "22\n"
        ]
       },
       {
        "output_type": "stream",
        "stream": "stdout",
        "text": [
-        "18\n"
+        "24\n"
        ]
       },
       {
        "output_type": "stream",
        "stream": "stdout",
        "text": [
-        "17\n"
+        "26\n"
        ]
       },
       {
        "output_type": "stream",
        "stream": "stdout",
        "text": [
-        "16\n"
+        "29\n"
        ]
       },
       {
        "output_type": "stream",
        "stream": "stdout",
        "text": [
-        "12\n"
+        "30\n"
        ]
       },
       {
        "output_type": "stream",
        "stream": "stdout",
        "text": [
-        "10\n"
+        "33\n"
        ]
       },
       {
        "output_type": "stream",
        "stream": "stdout",
        "text": [
-        "8\n"
+        "36\n"
        ]
       },
       {
        "output_type": "stream",
        "stream": "stdout",
        "text": [
-        "6\n"
+        "38\n"
        ]
       },
       {
        "output_type": "stream",
        "stream": "stdout",
        "text": [
-        "4\n"
+        "42\n"
        ]
       },
       {
        "output_type": "stream",
        "stream": "stdout",
        "text": [
-        "3\n"
+        "45\n"
        ]
       },
       {
        "output_type": "stream",
        "stream": "stdout",
        "text": [
-        "2\n"
+        "46\n"
        ]
       },
       {
        "output_type": "stream",
        "stream": "stdout",
        "text": [
-        "1\n"
+        "48\n"
        ]
       },
       {
        "output_type": "stream",
        "stream": "stdout",
        "text": [
-        "4\n"
+        "50\n"
        ]
       },
       {
        "output_type": "stream",
        "stream": "stdout",
        "text": [
-        "10\n"
+        "51\n"
        ]
       },
       {
        "output_type": "stream",
        "stream": "stdout",
        "text": [
-        "18\n"
+        "52\n"
        ]
       },
       {
        "output_type": "stream",
        "stream": "stdout",
        "text": [
-        "39\n"
+        "53\n"
        ]
       },
       {
        "output_type": "stream",
        "stream": "stdout",
        "text": [
-        "60\n"
+        "54\n"
        ]
       },
       {
        "output_type": "stream",
        "stream": "stdout",
        "text": [
-        "68\n"
+        "52\n"
        ]
       },
       {
        "output_type": "stream",
        "stream": "stdout",
        "text": [
-        "75\n"
+        "50\n"
        ]
       },
       {
        "output_type": "stream",
        "stream": "stdout",
        "text": [
-        "79\n"
+        "48\n"
        ]
       },
       {
        "output_type": "stream",
        "stream": "stdout",
        "text": [
-        "82\n"
+        "44\n"
        ]
       },
       {
        "output_type": "stream",
        "stream": "stdout",
        "text": [
-        "85\n"
+        "41\n"
        ]
       },
       {
        "output_type": "stream",
        "stream": "stdout",
        "text": [
-        "86\n"
+        "34\n"
+       ]
+      },
+      {
+       "output_type": "stream",
+       "stream": "stdout",
+       "text": [
+        "30\n"
+       ]
+      },
+      {
+       "output_type": "stream",
+       "stream": "stdout",
+       "text": [
+        "28\n"
+       ]
+      },
+      {
+       "output_type": "stream",
+       "stream": "stdout",
+       "text": [
+        "26\n"
+       ]
+      },
+      {
+       "output_type": "stream",
+       "stream": "stdout",
+       "text": [
+        "25\n"
+       ]
+      },
+      {
+       "output_type": "stream",
+       "stream": "stdout",
+       "text": [
+        "24\n"
        ]
       }
      ],
-     "prompt_number": 5
+     "prompt_number": 3
     },
     {
      "cell_type": "heading",
@@ -460,7 +425,7 @@
        ]
       }
      ],
-     "prompt_number": 6
+     "prompt_number": 4
     },
     {
      "cell_type": "markdown",
@@ -490,98 +455,49 @@
        "output_type": "stream",
        "stream": "stdout",
        "text": [
-        "85\n"
+        "23\n"
        ]
       },
       {
        "output_type": "stream",
        "stream": "stdout",
        "text": [
-        "84\n"
+        "24\n"
        ]
       },
       {
        "output_type": "stream",
        "stream": "stdout",
        "text": [
-        "81\n"
+        "28\n"
        ]
       },
       {
        "output_type": "stream",
        "stream": "stdout",
        "text": [
-        "79\n"
+        "30\n"
        ]
       },
       {
        "output_type": "stream",
        "stream": "stdout",
        "text": [
-        "73\n"
+        "37\n"
        ]
       },
       {
        "output_type": "stream",
        "stream": "stdout",
        "text": [
-        "70\n"
+        "39\n"
        ]
       },
       {
        "output_type": "stream",
        "stream": "stdout",
        "text": [
-        "67\n"
-       ]
-      },
-      {
-       "output_type": "stream",
-       "stream": "stdout",
-       "text": [
-        "59\n"
-       ]
-      },
-      {
-       "output_type": "stream",
-       "stream": "stdout",
-       "text": [
-        "56\n"
-       ]
-      },
-      {
-       "output_type": "stream",
-       "stream": "stdout",
-       "text": [
-        "53\n"
-       ]
-      },
-      {
-       "output_type": "stream",
-       "stream": "stdout",
-       "text": [
-        "51\n"
-       ]
-      },
-      {
-       "output_type": "stream",
-       "stream": "stdout",
-       "text": [
-        "49\n"
-       ]
-      },
-      {
-       "output_type": "stream",
-       "stream": "stdout",
-       "text": [
-        "47\n"
-       ]
-      },
-      {
-       "output_type": "stream",
-       "stream": "stdout",
-       "text": [
-        "45\n"
+        "41\n"
        ]
       },
       {
@@ -595,11 +511,39 @@
        "output_type": "stream",
        "stream": "stdout",
        "text": [
-        "42\n"
+        "46\n"
+       ]
+      },
+      {
+       "output_type": "stream",
+       "stream": "stdout",
+       "text": [
+        "48\n"
+       ]
+      },
+      {
+       "output_type": "stream",
+       "stream": "stdout",
+       "text": [
+        "50\n"
+       ]
+      },
+      {
+       "output_type": "stream",
+       "stream": "stdout",
+       "text": [
+        "51\n"
+       ]
+      },
+      {
+       "output_type": "stream",
+       "stream": "stdout",
+       "text": [
+        "53\n"
        ]
       }
      ],
-     "prompt_number": 7
+     "prompt_number": 5
     },
     {
      "cell_type": "code",
@@ -622,7 +566,7 @@
        "stream": "stdout",
        "text": [
         "Button clicked.\n",
-        "43\n"
+        "54\n"
        ]
       },
       {
@@ -630,7 +574,7 @@
        "stream": "stdout",
        "text": [
         "Button clicked.\n",
-        "44\n"
+        "55\n"
        ]
       },
       {
@@ -638,43 +582,11 @@
        "stream": "stdout",
        "text": [
         "Button clicked.\n",
-        "45\n"
-       ]
-      },
-      {
-       "output_type": "stream",
-       "stream": "stdout",
-       "text": [
-        "Button clicked.\n",
-        "46\n"
-       ]
-      },
-      {
-       "output_type": "stream",
-       "stream": "stdout",
-       "text": [
-        "Button clicked.\n",
-        "47\n"
-       ]
-      },
-      {
-       "output_type": "stream",
-       "stream": "stdout",
-       "text": [
-        "Button clicked.\n",
-        "48\n"
-       ]
-      },
-      {
-       "output_type": "stream",
-       "stream": "stdout",
-       "text": [
-        "Button clicked.\n",
-        "49\n"
+        "56\n"
        ]
       }
      ],
-     "prompt_number": 8
+     "prompt_number": 6
     },
     {
      "cell_type": "markdown",
@@ -733,7 +645,7 @@
      "language": "python",
      "metadata": {},
      "outputs": [],
-     "prompt_number": 9
+     "prompt_number": 7
     },
     {
      "cell_type": "code",