* Move and rename some tests * Add a merge organisation link * Add merge page * Don't display a second nav bar for support * Fix spacing * fix spacing and typos