Main nav: Smaller, Active style, Fix bugs.
Merge conflict.