I've added a toolbar at the top of the screen, and also implemented shape-drawing as a feature our staff can use to create new shapes to add to the location files. That should allow us to do away with SVG completely.