Fixed typo
Fixed Nicotinell theme
Implemented new nav bar