Redesign of personal site.
Fixing merge conflicts.