Notebooks improvements