Fixed more rendering issues...