Fixed some bugs. Make all the nav be active conditionally