Changed viewbox logic a bit