Added actual boxes and circles