Refactored top nav bar and add bottom nav bar