Move navigation to factory & Use Controller As syntax