Add updates from feature/navigation