Added some support for viewbox