Navigation Bar is now Smart
Merge pull request #112 from UAhmad7/master

Navigation Bar is now Smart
Merge pull request #113 from SUNY-Albany-CCI-INF362/master

Navigation Bar is now Smart