more cleanup of navigation and decks