Refactoring and Nav Bar Styling