Just some rendering issus fix