Moved shape support into its own manager.
Moved markers over to a manager.
Fixed a bad merge in the label renderer.