Code cleanup + move with nav goals now.