Changing some cosmetics and links