UI fixes and more SVG mappings added. Began reworking broken unit tests.