Moved drupal styling to layout and merged media queries display and attachment to one file