Comments fixed

Need to add table grid for link display