fixed the rendering issues