Fixed issue with collapsing navitems