Correct design after change of navi-3 in main repo