Add centralized navigation, prepare for accounting