Make the code uniform how it is used in the two platforms
Add code for doing navigation with parameters
Add missing file that does the navigation service