Changes as per PR feedback (Igor), and cleared build warnings caused by casing in navigation.service.
Attach a file by drag & drop or click to upload
