More svg graphics, moved some graphics