Added boxes to lots of result