Revert "cleaned up a conflict"

This reverts commit 44e36b84dd4dfea49b5c99439e561342d94f44fe.
Revert "styling changes to navbar"

This reverts commit c08264877bc1e1086b2ede7740a39da0c2dc539c.