Moved spans to inside braces

more uniform hilighting