Updated Circle Redraw, filenames, mapping views