Fixes navigation alignment issue, ticket DT-702
Merge branch 'develop' of github.com:basekit-templates/shot into develop