Added simple bounding boxes & circles to prepare for the addition of buttons.