changes to some of the rendering
merge conflicts