Made rendering smarter and fixed fill issue