rebase and fix bhtml nav issue