Updated content structure in navigation view helpers