Fixed some rendering issues