added full navigation part