navigation messages and button modified