Modify nav bar and menu to be neater