Fix minor rendering issues