Lots of navigation fixes. UI work.