3D mode looks less broken now