Refactored navbar and added some routes