Continued cleaning of navbar code.
Merge branch 'bug-smashing' of https://github.com/DaoudS/CYC into bug-smashing