Tidied up labels. Labels also now have an SVG rect box that is sized to match the text bounding box.