Create a context menu to choose shape to add to drawing, and clean up a few stylistic issues, including a partial move to object-orientation.