Changed some rendering (should be less heavy)