UI changes to fit Drupal Template