More changes in converting from bootstrap to semantic