Use HTML-style whitespace handling
Fix diagram CSS