Agreed on the navigation bit; I'd like to do that in a future patch.