link fix and table refactoring