3D - improved rendering and code layout