change layout to move all links to external stuff to the end of the list
Merge branch 'hotfix/2.1.1'