Updates for formatting, Drupal standards, better styling