fixed rendering issue
fixed rendering issues