Cleaned up some anchor business for the NavBar scrolling