styling changes to navbar
cleaned up a conflict