Remove special characters
Fix diagram sizing