Minor tweaks to tighten up schema.
Improving navigation bar.