Added more nav boilerplate