Navigation added. Minor tweaks.