D7 - fixing [#2208933] and reordering CSS for the new Drupal method.