Changed back navigation

Now using variable to track navigation
Merge branch 'navigation'