Updated Navigation

Made all navigation for all pages consistent