Inferred nbsps, fix up ul issues