Moved navigation service provider inside app