Added Nav Container to Maps PopUp
removed navigation VC from main VC
Refining the MapManager