Moved some links and changed text