YH-269: User navigation updates