Moved navigation to separate directive