More style tweaks to nav

Also improved naming of classes in nav.