Some rename and structure changes, nav bar update
Nav url fix