Grid fixes including better nested columns