Use svg text for title + minor fix