update and simplify navbar