Add some spans as styling hooks
merge
Add some spans as styling hooks