BUG/ENH: Fix Widget bugs, add to notebook