Worked on fixing rendering errors