MBH: API and nav cleanup