remade nav goal macro