Final fix of media queries