Correct navigation width, prevent horizontal scrolling when not needed
Merge branch 'fix/navigation' into dev