Better handling of nav bar