Changing some links and formatting