Fixed rendering issues!