Reorganize links and tweak layout.