Move the navigation bar to the common layout