Add a demo button for ipython notebook, plus other minor cosmetic changes.