Fix/convert to texture view