Redraw X's, reset highlights, add enclosure_box