fixed remaining rendering issues