unfinished test and layout changes for new link and renaming links