Fixes navigation alignment issue, ticket DT-702
Merges changes