Removed unused drupal overrrides css
Styling of modal, added forms styling and moved variables to buttons
Merge styles