Changes to support tooltips on boxes and setting proper z-indexes