add pure css navbar
Resolving merge conflicts
Resolving merge conflicts