Improve rendering diagram and port it to umlet