better navigation, better shade trigger

Change-Id: I8c8b5d79fb95996c363d52b8b96413832929b3fc