Added svg element, and fixed some class definitions