Boxed style and span fixes