layout refactoring, links fixed