Navigation changes.
Fixed some merge conflicts.
Adjusted logo.