Shapes and text have been added for the NB display

![snapshapes](https://f.cloud.github.com/assets/1975189/1199293/32ca5584-250b-11e3-8755-42a6c21aaeb5.png)