Fixed nav break between appx 960 and 1024

Media query cleanup in progress still but more than half way and all
working.