BZ-9469 navigation IDs fixed
Merge remote-tracking branch 'refs/remotes/origin/master'
BZ-9469 fixed layout