Slight cleanup for navs