Text, styling and diagram improvements