[Anastasia/Jorge] Change navigation