Changed handling of nav clicks and made goto publicly accessible