Added custom buffer viewer and fixed scattering