Solve Nav Issue
Merge branch 'bugfix/solve-nav-issue' into DEVELOPMENT