improve navigation

Change-Id: I2ebca5713a8378add0d1ee54f44e4fa188231891