APPWTV-25 navigation

As per commit message