Tidy up nav structure