improve table; consolidate links