adds a Config.navbar_selector option
fixes bad merge code