More svg changes. Some dynamic stuffs. Code is still yuck...