Use newest navbar code and support active link