Updates to navigation

Made navigation work properly.