Cleanup and fixed navigation bar active page highlighting