Updated IIFI structure on Navigation Controller
Modified Navigation as separate directive