Fix/navigation updates