-Patched to correct https://drupal.org/node/2104493
-Improved CSS