Cleaned up active navigation logic and unnecessary assignment