Navigation Controller modified