New navigation

New navigation, misc cleanup