Fixed rendering issues