navbar active fix, switch local angular fix
merge with upstream