fixed nav and main width sizing issues by adding a large media q
merged from master