Moved things around to avoid null pointers and made circles smaller.