Moved the link container to the layout