Cleaned up routes and created if statement for navbar display