Adds better handling of spans & circle viz