updated text and titles; added when and where to nav