Fixing heading links
Some cosmetics