more grid layout fixes