Refactored navbar a bit