Update basics and add mainNavigation module