Fix navigation and rebuild