Fix media query string. Fix viewport size calculation