Changed rendering logic