Visual updates. Move svg renders into containers

@hkal https://www.pivotaltracker.com/story/show/64311544