Add proper links, with some styling changes. Fix content.