fixed rendering issues