Add basic support for Circles to Layers screen (this really is horrible, horrible code)