resolved all the rendering issues