revised navigation to solve ios issue