Navfix looking good at all screen sizes
Merge branch 'navfix'