Reorganize skills and interests sections

- Also add missing link