Fix NavTabs and NavList

Make NavTabs and NavList save it's instance state.